[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36887] branches/soc-2010-jwilkins: Merged with trunk: 32509-33092
Jason Wilkins
Jason.A.Wilkins at gmail.com
Wed May 25 00:51:46 CEST 2011
Revision: 36887
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36887
Author: jwilkins
Date: 2011-05-24 22:51:46 +0000 (Tue, 24 May 2011)
Log Message:
-----------
Merged with trunk: 32509-33092
Modified Paths:
--------------
branches/soc-2010-jwilkins/CMakeLists.txt
branches/soc-2010-jwilkins/COPYING
branches/soc-2010-jwilkins/build_files/cmake/macros.cmake
branches/soc-2010-jwilkins/build_files/scons/config/linux2-config.py
branches/soc-2010-jwilkins/build_files/scons/config/win32-vc-config.py
branches/soc-2010-jwilkins/build_files/scons/config/win64-vc-config.py
branches/soc-2010-jwilkins/build_files/scons/tools/Blender.py
branches/soc-2010-jwilkins/build_files/scons/tools/btools.py
branches/soc-2010-jwilkins/extern/CMakeLists.txt
branches/soc-2010-jwilkins/extern/binreloc/CMakeLists.txt
branches/soc-2010-jwilkins/extern/bullet2/src/LinearMath/btQuickprof.cpp
branches/soc-2010-jwilkins/extern/glew/CMakeLists.txt
branches/soc-2010-jwilkins/extern/lzo/CMakeLists.txt
branches/soc-2010-jwilkins/intern/boolop/CMakeLists.txt
branches/soc-2010-jwilkins/intern/bsp/CMakeLists.txt
branches/soc-2010-jwilkins/intern/container/CMakeLists.txt
branches/soc-2010-jwilkins/intern/decimation/CMakeLists.txt
branches/soc-2010-jwilkins/intern/elbeem/CMakeLists.txt
branches/soc-2010-jwilkins/intern/ghost/GHOST_Types.h
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_EventPrinter.cpp
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_ModifierKeys.cpp
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_ModifierKeys.h
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemWin32.h
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2010-jwilkins/intern/ghost/test/multitest/EventToBuf.c
branches/soc-2010-jwilkins/intern/guardedalloc/CMakeLists.txt
branches/soc-2010-jwilkins/intern/guardedalloc/SConscript
branches/soc-2010-jwilkins/intern/guardedalloc/cpp/mallocn.cpp
branches/soc-2010-jwilkins/intern/iksolver/CMakeLists.txt
branches/soc-2010-jwilkins/intern/itasc/CMakeLists.txt
branches/soc-2010-jwilkins/intern/memutil/CMakeLists.txt
branches/soc-2010-jwilkins/intern/moto/CMakeLists.txt
branches/soc-2010-jwilkins/intern/opennl/CMakeLists.txt
branches/soc-2010-jwilkins/intern/string/CMakeLists.txt
branches/soc-2010-jwilkins/intern/string/SConscript
branches/soc-2010-jwilkins/release/bin/blender-thumbnailer.py
branches/soc-2010-jwilkins/release/datafiles/blenderbuttons
branches/soc-2010-jwilkins/release/getversion.py
branches/soc-2010-jwilkins/release/scripts/io/netrender/client.py
branches/soc-2010-jwilkins/release/scripts/io/netrender/master.py
branches/soc-2010-jwilkins/release/scripts/io/netrender/operators.py
branches/soc-2010-jwilkins/release/scripts/io/netrender/slave.py
branches/soc-2010-jwilkins/release/scripts/io/netrender/utils.py
branches/soc-2010-jwilkins/release/scripts/keyingsets/keyingsets_builtins.py
branches/soc-2010-jwilkins/release/scripts/modules/animsys_refactor.py
branches/soc-2010-jwilkins/release/scripts/modules/bpy/ops.py
branches/soc-2010-jwilkins/release/scripts/modules/bpy/path.py
branches/soc-2010-jwilkins/release/scripts/modules/bpy/utils.py
branches/soc-2010-jwilkins/release/scripts/modules/bpy_types.py
branches/soc-2010-jwilkins/release/scripts/modules/io_utils.py
branches/soc-2010-jwilkins/release/scripts/modules/rigify/__init__.py
branches/soc-2010-jwilkins/release/scripts/modules/rigify/eye_balls.py
branches/soc-2010-jwilkins/release/scripts/modules/rigify/mouth.py
branches/soc-2010-jwilkins/release/scripts/modules/rigify/shape_key_control.py
branches/soc-2010-jwilkins/release/scripts/modules/rigify/shape_key_distance.py
branches/soc-2010-jwilkins/release/scripts/modules/rigify/shape_key_rotdiff.py
branches/soc-2010-jwilkins/release/scripts/modules/rigify/tail_control.py
branches/soc-2010-jwilkins/release/scripts/modules/rna_info.py
branches/soc-2010-jwilkins/release/scripts/modules/rna_prop_ui.py
branches/soc-2010-jwilkins/release/scripts/op/animsys_update.py
branches/soc-2010-jwilkins/release/scripts/op/console_python.py
branches/soc-2010-jwilkins/release/scripts/op/fcurve_euler_filter.py
branches/soc-2010-jwilkins/release/scripts/op/image.py
branches/soc-2010-jwilkins/release/scripts/op/io_anim_bvh/__init__.py
branches/soc-2010-jwilkins/release/scripts/op/io_anim_bvh/import_bvh.py
branches/soc-2010-jwilkins/release/scripts/op/io_mesh_ply/__init__.py
branches/soc-2010-jwilkins/release/scripts/op/io_mesh_ply/export_ply.py
branches/soc-2010-jwilkins/release/scripts/op/io_scene_3ds/__init__.py
branches/soc-2010-jwilkins/release/scripts/op/io_scene_3ds/export_3ds.py
branches/soc-2010-jwilkins/release/scripts/op/io_scene_fbx/__init__.py
branches/soc-2010-jwilkins/release/scripts/op/io_scene_fbx/export_fbx.py
branches/soc-2010-jwilkins/release/scripts/op/io_scene_obj/__init__.py
branches/soc-2010-jwilkins/release/scripts/op/io_scene_obj/export_obj.py
branches/soc-2010-jwilkins/release/scripts/op/io_scene_obj/import_obj.py
branches/soc-2010-jwilkins/release/scripts/op/io_scene_x3d/export_x3d.py
branches/soc-2010-jwilkins/release/scripts/op/io_shape_mdd/__init__.py
branches/soc-2010-jwilkins/release/scripts/op/object.py
branches/soc-2010-jwilkins/release/scripts/op/object_randomize_transform.py
branches/soc-2010-jwilkins/release/scripts/op/presets.py
branches/soc-2010-jwilkins/release/scripts/op/screen_play_rendered_anim.py
branches/soc-2010-jwilkins/release/scripts/op/sequencer.py
branches/soc-2010-jwilkins/release/scripts/op/uv.py
branches/soc-2010-jwilkins/release/scripts/op/wm.py
branches/soc-2010-jwilkins/release/scripts/templates/gamelogic.py
branches/soc-2010-jwilkins/release/scripts/templates/gamelogic_basic.py
branches/soc-2010-jwilkins/release/scripts/templates/gamelogic_module.py
branches/soc-2010-jwilkins/release/scripts/templates/operator_modal_view3d.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_camera.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_mesh.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_object.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_particle.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_common.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_fluid.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_render.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_scene.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_texture.py
branches/soc-2010-jwilkins/release/scripts/ui/space_dopesheet.py
branches/soc-2010-jwilkins/release/scripts/ui/space_filebrowser.py
branches/soc-2010-jwilkins/release/scripts/ui/space_image.py
branches/soc-2010-jwilkins/release/scripts/ui/space_info.py
branches/soc-2010-jwilkins/release/scripts/ui/space_sequencer.py
branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
branches/soc-2010-jwilkins/release/scripts/ui/space_userpref_keymap.py
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d.py
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-jwilkins/release/test/rna_info_dump.py
branches/soc-2010-jwilkins/release/text/readme.html
branches/soc-2010-jwilkins/source/Makefile
branches/soc-2010-jwilkins/source/blender/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_blender.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_brush.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_context.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_curve.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_customdata.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_image.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_library.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_main.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_modifier.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_scene.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_texture.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2010-jwilkins/source/blender/blenkernel/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/blenkernel/SConscript
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/anim.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/armature.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/blender.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/boids.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/cloth.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/constraint.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/context.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/curve.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/customdata.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/displist.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/effect.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/exotic.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/font.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/idprop.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/image.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/lattice.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/library.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/mesh.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/modifier.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/node.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/object.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/packedFile.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/particle.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/particle_system.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/pointcache.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/report.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/scene.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/smoke.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/sound.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/unit.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_editVert.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_fileops.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_base.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_color.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_geom.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_vector.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_path_util.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_scanfill.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_storage.h
branches/soc-2010-jwilkins/source/blender/blenlib/intern/freetypefont.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_color.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_geom.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_rotation.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_vector.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/path_util.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/pbvh.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/scanfill.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/string.c
branches/soc-2010-jwilkins/source/blender/blenloader/BLO_writefile.h
branches/soc-2010-jwilkins/source/blender/blenloader/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/blenloader/intern/readblenentry.c
branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.h
branches/soc-2010-jwilkins/source/blender/blenloader/intern/writefile.c
branches/soc-2010-jwilkins/source/blender/blenpluginapi/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/collada/DocumentExporter.cpp
branches/soc-2010-jwilkins/source/blender/collada/DocumentExporter.h
branches/soc-2010-jwilkins/source/blender/collada/DocumentImporter.cpp
branches/soc-2010-jwilkins/source/blender/collada/DocumentImporter.h
branches/soc-2010-jwilkins/source/blender/collada/collada.cpp
branches/soc-2010-jwilkins/source/blender/collada/collada_internal.h
branches/soc-2010-jwilkins/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2010-jwilkins/source/blender/editors/animation/anim_draw.c
branches/soc-2010-jwilkins/source/blender/editors/animation/anim_filter.c
branches/soc-2010-jwilkins/source/blender/editors/animation/anim_markers.c
branches/soc-2010-jwilkins/source/blender/editors/animation/anim_ops.c
branches/soc-2010-jwilkins/source/blender/editors/animation/drivers.c
branches/soc-2010-jwilkins/source/blender/editors/animation/keyframes_general.c
branches/soc-2010-jwilkins/source/blender/editors/animation/keyframing.c
branches/soc-2010-jwilkins/source/blender/editors/animation/keyingsets.c
branches/soc-2010-jwilkins/source/blender/editors/armature/armature_intern.h
branches/soc-2010-jwilkins/source/blender/editors/armature/armature_ops.c
branches/soc-2010-jwilkins/source/blender/editors/armature/editarmature.c
branches/soc-2010-jwilkins/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2010-jwilkins/source/blender/editors/armature/meshlaplacian.c
branches/soc-2010-jwilkins/source/blender/editors/armature/meshlaplacian.h
branches/soc-2010-jwilkins/source/blender/editors/armature/poseSlide.c
branches/soc-2010-jwilkins/source/blender/editors/armature/poselib.c
branches/soc-2010-jwilkins/source/blender/editors/armature/poseobject.c
branches/soc-2010-jwilkins/source/blender/editors/curve/curve_ops.c
branches/soc-2010-jwilkins/source/blender/editors/curve/editcurve.c
branches/soc-2010-jwilkins/source/blender/editors/curve/editfont.c
branches/soc-2010-jwilkins/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2010-jwilkins/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2010-jwilkins/source/blender/editors/include/ED_armature.h
branches/soc-2010-jwilkins/source/blender/editors/include/ED_keyframing.h
branches/soc-2010-jwilkins/source/blender/editors/include/ED_mesh.h
branches/soc-2010-jwilkins/source/blender/editors/include/ED_node.h
branches/soc-2010-jwilkins/source/blender/editors/include/ED_object.h
branches/soc-2010-jwilkins/source/blender/editors/include/ED_screen.h
branches/soc-2010-jwilkins/source/blender/editors/include/ED_screen_types.h
branches/soc-2010-jwilkins/source/blender/editors/include/ED_types.h
branches/soc-2010-jwilkins/source/blender/editors/include/ED_uvedit.h
branches/soc-2010-jwilkins/source/blender/editors/include/UI_interface.h
branches/soc-2010-jwilkins/source/blender/editors/include/UI_view2d.h
branches/soc-2010-jwilkins/source/blender/editors/interface/interface.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_anim.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_draw.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_icons.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_intern.h
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_layout.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_ops.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_panel.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_regions.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_templates.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_utils.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_widgets.c
branches/soc-2010-jwilkins/source/blender/editors/interface/view2d.c
branches/soc-2010-jwilkins/source/blender/editors/interface/view2d_ops.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_add.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/loopcut.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/mesh_data.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/mesh_ops.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/meshtools.c
branches/soc-2010-jwilkins/source/blender/editors/metaball/mball_edit.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_add.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_bake.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_constraint.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_edit.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_group.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_hook.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_lattice.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_modifier.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_relations.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_select.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_shapekey.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_transform.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_vgroup.c
branches/soc-2010-jwilkins/source/blender/editors/physics/particle_boids.c
branches/soc-2010-jwilkins/source/blender/editors/physics/particle_edit.c
branches/soc-2010-jwilkins/source/blender/editors/physics/particle_object.c
branches/soc-2010-jwilkins/source/blender/editors/physics/physics_pointcache.c
branches/soc-2010-jwilkins/source/blender/editors/render/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/render/render_internal.c
branches/soc-2010-jwilkins/source/blender/editors/render/render_opengl.c
branches/soc-2010-jwilkins/source/blender/editors/render/render_shading.c
branches/soc-2010-jwilkins/source/blender/editors/screen/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/screen/area.c
branches/soc-2010-jwilkins/source/blender/editors/screen/glutil.c
branches/soc-2010-jwilkins/source/blender/editors/screen/screen_context.c
branches/soc-2010-jwilkins/source/blender/editors/screen/screen_edit.c
branches/soc-2010-jwilkins/source/blender/editors/screen/screen_intern.h
branches/soc-2010-jwilkins/source/blender/editors/screen/screen_ops.c
branches/soc-2010-jwilkins/source/blender/editors/screen/screendump.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-jwilkins/source/blender/editors/sound/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/sound/sound_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_action/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_action/action_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_action/action_select.c
branches/soc-2010-jwilkins/source/blender/editors/space_action/space_action.c
branches/soc-2010-jwilkins/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_console/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_console/console_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_console/console_intern.h
branches/soc-2010-jwilkins/source/blender/editors/space_console/console_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_console/console_report.c
branches/soc-2010-jwilkins/source/blender/editors/space_console/space_console.c
branches/soc-2010-jwilkins/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_file/file_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_file/file_intern.h
branches/soc-2010-jwilkins/source/blender/editors/space_file/file_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_file/file_panels.c
branches/soc-2010-jwilkins/source/blender/editors/space_file/filelist.c
branches/soc-2010-jwilkins/source/blender/editors/space_file/filelist.h
branches/soc-2010-jwilkins/source/blender/editors/space_file/filesel.c
branches/soc-2010-jwilkins/source/blender/editors/space_file/space_file.c
branches/soc-2010-jwilkins/source/blender/editors/space_graph/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_select.c
branches/soc-2010-jwilkins/source/blender/editors/space_graph/space_graph.c
branches/soc-2010-jwilkins/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_image/SConscript
branches/soc-2010-jwilkins/source/blender/editors/space_image/image_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_image/image_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_image/image_header.c
branches/soc-2010-jwilkins/source/blender/editors/space_image/image_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_image/image_render.c
branches/soc-2010-jwilkins/source/blender/editors/space_image/space_image.c
branches/soc-2010-jwilkins/source/blender/editors/space_info/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_info/info_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_info/space_info.c
branches/soc-2010-jwilkins/source/blender/editors/space_logic/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-jwilkins/source/blender/editors/space_logic/space_logic.c
branches/soc-2010-jwilkins/source/blender/editors/space_nla/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_channels.c
branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_nla/space_nla.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_node/drawnode.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_header.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_intern.h
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_select.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_state.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/space_node.c
branches/soc-2010-jwilkins/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-jwilkins/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2010-jwilkins/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_script/script_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_script/space_script.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2010-jwilkins/source/blender/editors/space_sound/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_sound/space_sound.c
branches/soc-2010-jwilkins/source/blender/editors/space_text/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_text/space_text.c
branches/soc-2010-jwilkins/source/blender/editors/space_text/text_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_text/text_header.c
branches/soc-2010-jwilkins/source/blender/editors/space_text/text_intern.h
branches/soc-2010-jwilkins/source/blender/editors/space_text/text_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_text/text_python.c
branches/soc-2010-jwilkins/source/blender/editors/space_time/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_time/space_time.c
branches/soc-2010-jwilkins/source/blender/editors/space_time/time_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_userpref/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-jwilkins/source/blender/editors/transform/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/transform/transform.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_generics.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_manipulator.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_ops.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_snap.c
branches/soc-2010-jwilkins/source/blender/editors/util/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/util/undo.c
branches/soc-2010-jwilkins/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2010-jwilkins/source/blender/gpu/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/gpu/GPU_draw.h
branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_draw.c
branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_material.c
branches/soc-2010-jwilkins/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2010-jwilkins/source/blender/imbuf/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/imbuf/IMB_imbuf.h
branches/soc-2010-jwilkins/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2010-jwilkins/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2010-jwilkins/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/imbuf/intern/jpeg.c
branches/soc-2010-jwilkins/source/blender/imbuf/intern/readimage.c
branches/soc-2010-jwilkins/source/blender/imbuf/intern/scaling.c
branches/soc-2010-jwilkins/source/blender/imbuf/intern/thumbs_blend.c
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_boid_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_curve_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_object_force.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_scene_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_space_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_texture_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_vec_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_vfont_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/makesdna/intern/makesdna.c
branches/soc-2010-jwilkins/source/blender/makesrna/RNA_access.h
branches/soc-2010-jwilkins/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/makesrna/intern/makesrna.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_ID.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_access.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_animation.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_armature.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_armature_api.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_boid.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_camera.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_color.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_define.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_image.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_internal.h
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_main.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_material.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_particle.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_pose_api.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_screen.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_space.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_wm.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_world.c
branches/soc-2010-jwilkins/source/blender/modifiers/MOD_modifiertypes.h
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_array.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_build.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_fluidsim.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_none.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_shapekey.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_softbody.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_subsurf.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_surface.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_util.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_util.h
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_util.c
branches/soc-2010-jwilkins/source/blender/python/generic/IDProp.c
branches/soc-2010-jwilkins/source/blender/python/generic/bgl.c
branches/soc-2010-jwilkins/source/blender/python/generic/blf_api.c
branches/soc-2010-jwilkins/source/blender/python/generic/bpy_internal_import.c
branches/soc-2010-jwilkins/source/blender/python/generic/bpy_internal_import.h
branches/soc-2010-jwilkins/source/blender/python/generic/geometry.c
branches/soc-2010-jwilkins/source/blender/python/generic/mathutils.c
branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_color.c
branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_euler.c
branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_matrix.c
branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_quat.c
branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_vector.c
branches/soc-2010-jwilkins/source/blender/python/generic/noise.c
branches/soc-2010-jwilkins/source/blender/python/generic/py_capi_utils.c
branches/soc-2010-jwilkins/source/blender/python/generic/py_capi_utils.h
branches/soc-2010-jwilkins/source/blender/python/intern/bpy.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_app.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_array.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_interface.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_operator.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_props.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_rna.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_rna.h
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_rna_callback.c
branches/soc-2010-jwilkins/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2010-jwilkins/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2010-jwilkins/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2010-jwilkins/source/blender/render/extern/include/RE_render_ext.h
branches/soc-2010-jwilkins/source/blender/render/intern/source/convertblender.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/imagetexture.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/pipeline.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/pointdensity.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/rayshade.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/rendercore.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/renderdatabase.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/shadeinput.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/shadeoutput.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/texture.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/volumetric.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/voxeldata.c
branches/soc-2010-jwilkins/source/blender/windowmanager/WM_api.h
branches/soc-2010-jwilkins/source/blender/windowmanager/WM_types.h
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_window.c
branches/soc-2010-jwilkins/source/blender/windowmanager/wm.h
branches/soc-2010-jwilkins/source/blender/windowmanager/wm_event_types.h
branches/soc-2010-jwilkins/source/blender/windowmanager/wm_window.h
branches/soc-2010-jwilkins/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/soc-2010-jwilkins/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2010-jwilkins/source/creator/CMakeLists.txt
branches/soc-2010-jwilkins/source/creator/buildinfo.c
branches/soc-2010-jwilkins/source/creator/creator.c
branches/soc-2010-jwilkins/source/darwin/Makefile
branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/KX_BlenderGL.h
branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/Makefile
branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/SConscript
branches/soc-2010-jwilkins/source/gameengine/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/soc-2010-jwilkins/source/gameengine/Converter/BlenderWorldInfo.cpp
branches/soc-2010-jwilkins/source/gameengine/Converter/BlenderWorldInfo.h
branches/soc-2010-jwilkins/source/gameengine/Converter/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2010-jwilkins/source/gameengine/Converter/SConscript
branches/soc-2010-jwilkins/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2010-jwilkins/source/gameengine/Expressions/SConscript
branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_LogicManager.h
branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2010-jwilkins/source/gameengine/GameLogic/SConscript
branches/soc-2010-jwilkins/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2010-jwilkins/source/gameengine/Ketsji/SConscript
branches/soc-2010-jwilkins/source/gameengine/Network/SConscript
branches/soc-2010-jwilkins/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/Physics/Bullet/SConscript
branches/soc-2010-jwilkins/source/gameengine/Physics/Dummy/SConscript
branches/soc-2010-jwilkins/source/gameengine/Physics/common/SConscript
branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/soc-2010-jwilkins/source/gameengine/Rasterizer/SConscript
branches/soc-2010-jwilkins/source/gameengine/SConscript
branches/soc-2010-jwilkins/source/gameengine/SceneGraph/SConscript
Added Paths:
-----------
branches/soc-2010-jwilkins/doc/build_systems/
branches/soc-2010-jwilkins/doc/build_systems/README.windows-gcc
branches/soc-2010-jwilkins/doc/build_systems/cmake.txt
branches/soc-2010-jwilkins/doc/build_systems/scons-dev.txt
branches/soc-2010-jwilkins/doc/build_systems/scons.txt
branches/soc-2010-jwilkins/doc/guides/
branches/soc-2010-jwilkins/doc/guides/blender-guardedalloc.txt
branches/soc-2010-jwilkins/doc/guides/interface_API.txt
branches/soc-2010-jwilkins/doc/guides/python-dev-guide.txt
branches/soc-2010-jwilkins/doc/license/
branches/soc-2010-jwilkins/doc/license/BL-license.txt
branches/soc-2010-jwilkins/doc/license/GPL-license.txt
branches/soc-2010-jwilkins/doc/license/bf-members.txt
branches/soc-2010-jwilkins/doc/manpage/
branches/soc-2010-jwilkins/doc/manpage/blender.1
branches/soc-2010-jwilkins/doc/manpage/blender.1.py
branches/soc-2010-jwilkins/doc/python_api/
branches/soc-2010-jwilkins/doc/python_api/alternative/
branches/soc-2010-jwilkins/doc/python_api/alternative/README
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/layout.html
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/page.html
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/static/
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/static/bg.png
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/static/default.css_t
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/static/favicon.ico
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/static/jquery.sidebar.js
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/static/pygments.css
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/static/rnd.png
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/static/rndbl.png
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/static/rndbr.png
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/theme.conf
branches/soc-2010-jwilkins/doc/python_api/alternative/datatypes.py
branches/soc-2010-jwilkins/doc/python_api/alternative/epy/
branches/soc-2010-jwilkins/doc/python_api/alternative/epy/PhysicsConstraints.py
branches/soc-2010-jwilkins/doc/python_api/alternative/epy/VideoTexture.py
branches/soc-2010-jwilkins/doc/python_api/alternative/epy/__init__.py
branches/soc-2010-jwilkins/doc/python_api/alternative/epy/bgl.py
branches/soc-2010-jwilkins/doc/python_api/alternative/epy/geometry.py
branches/soc-2010-jwilkins/doc/python_api/alternative/epy/idprop.py
branches/soc-2010-jwilkins/doc/python_api/alternative/epyparser.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/PhysicsConstraints.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/VideoTexture.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/aud.Device.lock.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/aud.Factory.filter.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/aud.Factory.join.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/aud.Factory.pingpong.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/aud.Factory.sine.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/aud.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.events.allkeys.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.events.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.logic.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.render.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.CListValue.from_id.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_Camera.boxInsideFrustum.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_Camera.getScreenPosition.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_Camera.getScreenRay.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_Camera.getScreenVect.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_Camera.pointInsideFrustum.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_Camera.sphereInsideFrustum.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_GameObject.rayCast.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_LightObject.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_MeshProxy.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_PolygonMaterial.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_PolygonMaterial.setCustomMaterial.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_PolygonMaterial.setTexture.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_SCA_ReplaceMeshActuator.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_Scene.active_camera.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_Scene.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_VertexProxy.getRGBA.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_VertexProxy.setRGBA.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bgl.Buffer.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bgl.glRasterPos.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bgl.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bpy.data.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/geometry.BoxPack2D.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/geometry.PolyFill.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/idprop.IDGroup.iteritems.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/idprop.IDGroup.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/idprop.IDGroup.values.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/idprop.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/mathutils.Euler.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/mathutils.Matrix.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/mathutils.Quaternion.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/mathutils.Vector.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/mathutils.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/LICENSE
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/__init__.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/_ast_util.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ast.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/cache.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/codegen.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/exceptions.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/__init__.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/autohandler.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/babelplugin.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/preprocessors.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/pygmentplugin.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/turbogears.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/filters.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/lexer.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/lookup.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/parsetree.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/pygen.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/pyparser.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/runtime.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/template.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/util.py
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/AUTHORS
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/LICENSE
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/__init__.py
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/_constants.py
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/_native.py
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/_speedups.c
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/_speedups.py
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/_speedups.so
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/tests.py
branches/soc-2010-jwilkins/doc/python_api/alternative/pyparser.py
branches/soc-2010-jwilkins/doc/python_api/alternative/rnaparser.py
branches/soc-2010-jwilkins/doc/python_api/alternative/rst/
branches/soc-2010-jwilkins/doc/python_api/alternative/rst/bge.events.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/rst/bge.logic.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/rst/bge.render.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/rst/bge.types.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/run.py
branches/soc-2010-jwilkins/doc/python_api/alternative/sphinxoutput.py
branches/soc-2010-jwilkins/doc/python_api/alternative/sphinxparser.py
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/Class.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/Layout.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/Module.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/bge.events.Module.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/bge.logic.Module.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/bpy.data.Module.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/bpy.ops.Class.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/bpy.ops.Module.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/bpy.types.Class.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/conf.py
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/contents.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/util.py
branches/soc-2010-jwilkins/doc/python_api/alternative/validator.py
branches/soc-2010-jwilkins/doc/python_api/blender-org/
branches/soc-2010-jwilkins/doc/python_api/blender-org/layout.html
branches/soc-2010-jwilkins/doc/python_api/blender-org/page.html
branches/soc-2010-jwilkins/doc/python_api/blender-org/static/
branches/soc-2010-jwilkins/doc/python_api/blender-org/static/bg.png
branches/soc-2010-jwilkins/doc/python_api/blender-org/static/default.css_t
branches/soc-2010-jwilkins/doc/python_api/blender-org/static/favicon.ico
branches/soc-2010-jwilkins/doc/python_api/blender-org/static/jquery.sidebar.js
branches/soc-2010-jwilkins/doc/python_api/blender-org/static/pygments.css
branches/soc-2010-jwilkins/doc/python_api/blender-org/static/rnd.png
branches/soc-2010-jwilkins/doc/python_api/blender-org/static/rndbl.png
branches/soc-2010-jwilkins/doc/python_api/blender-org/static/rndbr.png
branches/soc-2010-jwilkins/doc/python_api/blender-org/theme.conf
branches/soc-2010-jwilkins/doc/python_api/epy/
branches/soc-2010-jwilkins/doc/python_api/epy/BGL.py
branches/soc-2010-jwilkins/doc/python_api/epy/Geometry.py
branches/soc-2010-jwilkins/doc/python_api/epy/IDProp.py
branches/soc-2010-jwilkins/doc/python_api/epy/Mathutils.py
branches/soc-2010-jwilkins/doc/python_api/epy/testbgl.py
branches/soc-2010-jwilkins/doc/python_api/examples/
branches/soc-2010-jwilkins/doc/python_api/examples/bpy.data.py
branches/soc-2010-jwilkins/doc/python_api/examples/mathutils.Euler.py
branches/soc-2010-jwilkins/doc/python_api/examples/mathutils.Matrix.py
branches/soc-2010-jwilkins/doc/python_api/examples/mathutils.Quaternion.py
branches/soc-2010-jwilkins/doc/python_api/examples/mathutils.Vector.py
branches/soc-2010-jwilkins/doc/python_api/examples/mathutils.py
branches/soc-2010-jwilkins/doc/python_api/rst/
branches/soc-2010-jwilkins/doc/python_api/rst/bge.events.rst
branches/soc-2010-jwilkins/doc/python_api/rst/bge.logic.rst
branches/soc-2010-jwilkins/doc/python_api/rst/bge.render.rst
branches/soc-2010-jwilkins/doc/python_api/rst/bge.types.rst
branches/soc-2010-jwilkins/doc/python_api/sphinx_doc_gen.py
branches/soc-2010-jwilkins/doc/python_api/sphinx_doc_gen.sh
branches/soc-2010-jwilkins/doc/python_api/sphinx_html_compact.diff
branches/soc-2010-jwilkins/release/scripts/presets/keyconfig/maya.py
branches/soc-2010-jwilkins/source/blender/collada/AnimationImporter.cpp
branches/soc-2010-jwilkins/source/blender/collada/AnimationImporter.h
branches/soc-2010-jwilkins/source/blender/collada/ArmatureExporter.cpp
branches/soc-2010-jwilkins/source/blender/collada/ArmatureExporter.h
branches/soc-2010-jwilkins/source/blender/collada/ArmatureImporter.cpp
branches/soc-2010-jwilkins/source/blender/collada/ArmatureImporter.h
branches/soc-2010-jwilkins/source/blender/collada/CameraExporter.cpp
branches/soc-2010-jwilkins/source/blender/collada/CameraExporter.h
branches/soc-2010-jwilkins/source/blender/collada/EffectExporter.cpp
branches/soc-2010-jwilkins/source/blender/collada/EffectExporter.h
branches/soc-2010-jwilkins/source/blender/collada/GeometryExporter.cpp
branches/soc-2010-jwilkins/source/blender/collada/GeometryExporter.h
branches/soc-2010-jwilkins/source/blender/collada/ImageExporter.cpp
branches/soc-2010-jwilkins/source/blender/collada/ImageExporter.h
branches/soc-2010-jwilkins/source/blender/collada/InstanceWriter.cpp
branches/soc-2010-jwilkins/source/blender/collada/InstanceWriter.h
branches/soc-2010-jwilkins/source/blender/collada/LightExporter.cpp
branches/soc-2010-jwilkins/source/blender/collada/LightExporter.h
branches/soc-2010-jwilkins/source/blender/collada/MaterialExporter.cpp
branches/soc-2010-jwilkins/source/blender/collada/MaterialExporter.h
branches/soc-2010-jwilkins/source/blender/collada/MeshImporter.cpp
branches/soc-2010-jwilkins/source/blender/collada/MeshImporter.h
branches/soc-2010-jwilkins/source/blender/collada/SkinInfo.cpp
branches/soc-2010-jwilkins/source/blender/collada/SkinInfo.h
branches/soc-2010-jwilkins/source/blender/collada/TransformReader.cpp
branches/soc-2010-jwilkins/source/blender/collada/TransformReader.h
branches/soc-2010-jwilkins/source/blender/collada/TransformWriter.cpp
branches/soc-2010-jwilkins/source/blender/collada/TransformWriter.h
branches/soc-2010-jwilkins/source/blender/collada/collada_internal.cpp
branches/soc-2010-jwilkins/source/blender/collada/collada_utils.cpp
branches/soc-2010-jwilkins/source/blender/collada/collada_utils.h
Removed Paths:
-------------
branches/soc-2010-jwilkins/doc/BL-license.txt
branches/soc-2010-jwilkins/doc/GPL-license.txt
branches/soc-2010-jwilkins/doc/README.windows-gcc
branches/soc-2010-jwilkins/doc/bf-members.txt
branches/soc-2010-jwilkins/doc/blender-cmake.txt
branches/soc-2010-jwilkins/doc/blender-guardedalloc.txt
branches/soc-2010-jwilkins/doc/blender-scons-dev.txt
branches/soc-2010-jwilkins/doc/blender-scons.txt
branches/soc-2010-jwilkins/doc/blender.1
branches/soc-2010-jwilkins/doc/blender.1.py
branches/soc-2010-jwilkins/doc/build_systems/README.windows-gcc
branches/soc-2010-jwilkins/doc/build_systems/cmake.txt
branches/soc-2010-jwilkins/doc/build_systems/scons-dev.txt
branches/soc-2010-jwilkins/doc/build_systems/scons.txt
branches/soc-2010-jwilkins/doc/guides/blender-guardedalloc.txt
branches/soc-2010-jwilkins/doc/guides/interface_API.txt
branches/soc-2010-jwilkins/doc/guides/python-dev-guide.txt
branches/soc-2010-jwilkins/doc/interface_API.txt
branches/soc-2010-jwilkins/doc/license/BL-license.txt
branches/soc-2010-jwilkins/doc/license/GPL-license.txt
branches/soc-2010-jwilkins/doc/license/bf-members.txt
branches/soc-2010-jwilkins/doc/manpage/blender.1
branches/soc-2010-jwilkins/doc/manpage/blender.1.py
branches/soc-2010-jwilkins/doc/oldbugs.txt
branches/soc-2010-jwilkins/doc/python-dev-guide.txt
branches/soc-2010-jwilkins/doc/python_api/alternative/
branches/soc-2010-jwilkins/doc/python_api/alternative/README
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/layout.html
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/page.html
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/static/
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/static/bg.png
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/static/default.css_t
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/static/favicon.ico
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/static/jquery.sidebar.js
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/static/pygments.css
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/static/rnd.png
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/static/rndbl.png
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/static/rndbr.png
branches/soc-2010-jwilkins/doc/python_api/alternative/blender-org/theme.conf
branches/soc-2010-jwilkins/doc/python_api/alternative/datatypes.py
branches/soc-2010-jwilkins/doc/python_api/alternative/epy/
branches/soc-2010-jwilkins/doc/python_api/alternative/epy/PhysicsConstraints.py
branches/soc-2010-jwilkins/doc/python_api/alternative/epy/VideoTexture.py
branches/soc-2010-jwilkins/doc/python_api/alternative/epy/__init__.py
branches/soc-2010-jwilkins/doc/python_api/alternative/epy/bgl.py
branches/soc-2010-jwilkins/doc/python_api/alternative/epy/geometry.py
branches/soc-2010-jwilkins/doc/python_api/alternative/epy/idprop.py
branches/soc-2010-jwilkins/doc/python_api/alternative/epyparser.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/PhysicsConstraints.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/VideoTexture.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/aud.Device.lock.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/aud.Factory.filter.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/aud.Factory.join.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/aud.Factory.pingpong.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/aud.Factory.sine.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/aud.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.events.allkeys.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.events.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.logic.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.render.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.CListValue.from_id.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_Camera.boxInsideFrustum.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_Camera.getScreenPosition.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_Camera.getScreenRay.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_Camera.getScreenVect.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_Camera.pointInsideFrustum.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_Camera.sphereInsideFrustum.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_GameObject.rayCast.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_LightObject.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_MeshProxy.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_PolygonMaterial.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_PolygonMaterial.setCustomMaterial.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_PolygonMaterial.setTexture.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_SCA_ReplaceMeshActuator.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_Scene.active_camera.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_Scene.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_VertexProxy.getRGBA.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bge.types.KX_VertexProxy.setRGBA.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bgl.Buffer.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bgl.glRasterPos.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bgl.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/bpy.data.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/geometry.BoxPack2D.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/geometry.PolyFill.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/idprop.IDGroup.iteritems.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/idprop.IDGroup.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/idprop.IDGroup.values.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/idprop.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/mathutils.Euler.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/mathutils.Matrix.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/mathutils.Quaternion.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/mathutils.Vector.py
branches/soc-2010-jwilkins/doc/python_api/alternative/examples/mathutils.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/LICENSE
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/__init__.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/_ast_util.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ast.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/cache.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/codegen.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/exceptions.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/__init__.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/autohandler.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/babelplugin.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/preprocessors.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/pygmentplugin.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/turbogears.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/filters.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/lexer.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/lookup.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/parsetree.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/pygen.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/pyparser.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/runtime.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/template.py
branches/soc-2010-jwilkins/doc/python_api/alternative/mako/util.py
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/AUTHORS
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/LICENSE
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/__init__.py
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/_constants.py
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/_native.py
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/_speedups.c
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/_speedups.py
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/_speedups.so
branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/tests.py
branches/soc-2010-jwilkins/doc/python_api/alternative/pyparser.py
branches/soc-2010-jwilkins/doc/python_api/alternative/rnaparser.py
branches/soc-2010-jwilkins/doc/python_api/alternative/rst/
branches/soc-2010-jwilkins/doc/python_api/alternative/rst/bge.events.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/rst/bge.logic.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/rst/bge.render.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/rst/bge.types.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/run.py
branches/soc-2010-jwilkins/doc/python_api/alternative/sphinxoutput.py
branches/soc-2010-jwilkins/doc/python_api/alternative/sphinxparser.py
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/Class.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/Layout.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/Module.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/bge.events.Module.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/bge.logic.Module.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/bpy.data.Module.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/bpy.ops.Class.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/bpy.ops.Module.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/bpy.types.Class.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/conf.py
branches/soc-2010-jwilkins/doc/python_api/alternative/templates/contents.rst
branches/soc-2010-jwilkins/doc/python_api/alternative/util.py
branches/soc-2010-jwilkins/doc/python_api/alternative/validator.py
branches/soc-2010-jwilkins/doc/python_api/blender-org/
branches/soc-2010-jwilkins/doc/python_api/blender-org/layout.html
branches/soc-2010-jwilkins/doc/python_api/blender-org/page.html
branches/soc-2010-jwilkins/doc/python_api/blender-org/static/
branches/soc-2010-jwilkins/doc/python_api/blender-org/static/bg.png
branches/soc-2010-jwilkins/doc/python_api/blender-org/static/default.css_t
branches/soc-2010-jwilkins/doc/python_api/blender-org/static/favicon.ico
branches/soc-2010-jwilkins/doc/python_api/blender-org/static/jquery.sidebar.js
branches/soc-2010-jwilkins/doc/python_api/blender-org/static/pygments.css
branches/soc-2010-jwilkins/doc/python_api/blender-org/static/rnd.png
branches/soc-2010-jwilkins/doc/python_api/blender-org/static/rndbl.png
branches/soc-2010-jwilkins/doc/python_api/blender-org/static/rndbr.png
branches/soc-2010-jwilkins/doc/python_api/blender-org/theme.conf
branches/soc-2010-jwilkins/doc/python_api/epy/
branches/soc-2010-jwilkins/doc/python_api/epy/BGL.py
branches/soc-2010-jwilkins/doc/python_api/epy/Geometry.py
branches/soc-2010-jwilkins/doc/python_api/epy/IDProp.py
branches/soc-2010-jwilkins/doc/python_api/epy/Mathutils.py
branches/soc-2010-jwilkins/doc/python_api/epy/testbgl.py
branches/soc-2010-jwilkins/doc/python_api/examples/
branches/soc-2010-jwilkins/doc/python_api/examples/bpy.data.py
branches/soc-2010-jwilkins/doc/python_api/examples/mathutils.Euler.py
branches/soc-2010-jwilkins/doc/python_api/examples/mathutils.Matrix.py
branches/soc-2010-jwilkins/doc/python_api/examples/mathutils.Quaternion.py
branches/soc-2010-jwilkins/doc/python_api/examples/mathutils.Vector.py
branches/soc-2010-jwilkins/doc/python_api/examples/mathutils.py
branches/soc-2010-jwilkins/doc/python_api/rst/
branches/soc-2010-jwilkins/doc/python_api/rst/bge.events.rst
branches/soc-2010-jwilkins/doc/python_api/rst/bge.logic.rst
branches/soc-2010-jwilkins/doc/python_api/rst/bge.render.rst
branches/soc-2010-jwilkins/doc/python_api/rst/bge.types.rst
branches/soc-2010-jwilkins/doc/python_api/sphinx_doc_gen.py
branches/soc-2010-jwilkins/doc/python_api/sphinx_doc_gen.sh
branches/soc-2010-jwilkins/doc/python_api/sphinx_html_compact.diff
branches/soc-2010-jwilkins/projectfiles/blender/
branches/soc-2010-jwilkins/projectfiles/datatoc/
branches/soc-2010-jwilkins/projectfiles/gameengine/
branches/soc-2010-jwilkins/projectfiles/kernel/
branches/soc-2010-jwilkins/projectfiles/sumo/
branches/soc-2010-jwilkins/projectfiles_vc7/blender/
branches/soc-2010-jwilkins/projectfiles_vc7/gameengine/
branches/soc-2010-jwilkins/projectfiles_vc7/kernel/
branches/soc-2010-jwilkins/projectfiles_vc7/sumo/
branches/soc-2010-jwilkins/projectfiles_vc9/blender/
branches/soc-2010-jwilkins/projectfiles_vc9/gameengine/
branches/soc-2010-jwilkins/projectfiles_vc9/kernel/
branches/soc-2010-jwilkins/projectfiles_vc9/sumo/
branches/soc-2010-jwilkins/release/scripts/presets/interaction/maya.py
branches/soc-2010-jwilkins/source/blender/python/doc/
branches/soc-2010-jwilkins/source/gameengine/PyDoc/bge.events.rst
branches/soc-2010-jwilkins/source/gameengine/PyDoc/bge.logic.rst
branches/soc-2010-jwilkins/source/gameengine/PyDoc/bge.render.rst
branches/soc-2010-jwilkins/source/gameengine/PyDoc/bge.types.rst
Property Changed:
----------------
branches/soc-2010-jwilkins/
branches/soc-2010-jwilkins/release/scripts/op/io_anim_bvh/import_bvh.py
branches/soc-2010-jwilkins/release/scripts/op/io_scene_obj/import_obj.py
Property changes on: branches/soc-2010-jwilkins
___________________________________________________________________
Modified: svn:ignore
- *.pdb
.*
TAGS
build
cscope.out
install
mingw
mingw-user-config.py
mingw-user-config_debug.py
msvc
msvc-user-config.py
obj
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
user-def.mk
+ *.pdb
.*
TAGS
build
cscope.out
install
mingw
mingw-user-config.py
mingw-user-config_debug.py
msvc
msvc-user-config.py
obj
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
user-def.mk
graphicall_32b
graphicall_64b
graphicall_64b_debug
installer_32b
installer_64b
Modified: svn:mergeinfo
- /trunk/blender:30832-31956
+ /trunk/blender:30832-32508
Modified: branches/soc-2010-jwilkins/CMakeLists.txt
===================================================================
--- branches/soc-2010-jwilkins/CMakeLists.txt 2011-05-24 22:51:11 UTC (rev 36886)
+++ branches/soc-2010-jwilkins/CMakeLists.txt 2011-05-24 22:51:46 UTC (rev 36887)
@@ -127,12 +127,9 @@
OPTION(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
ENDIF(APPLE)
-IF(NOT WITH_BULLET AND WITH_GAMEENGINE)
- MESSAGE("WARNING: WITH_GAMEENGINE needs WITH_BULLET")
-ENDIF(NOT WITH_BULLET AND WITH_GAMEENGINE)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
- MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
+ MESSAGE(FATAL_ERROR "WITH_PLAYER needs WITH_GAMEENGINE")
ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
IF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
@@ -150,7 +147,7 @@
# On Macs:
# cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/3.1/include/python3.1 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.1/lib/python3.1/config -G Xcode ../blender
#
-# When changing any of this remember to update the notes in doc/blender-cmake.txt
+# When changing any of this remember to update the notes in doc/build_systems/cmake.txt
#-----------------------------------------------------------------------------
#Platform specifics
@@ -298,6 +295,7 @@
FIND_PACKAGE(X11 REQUIRED)
+ # OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
SET(LLIBS "-lutil -lc -lm -lpthread -lstdc++ ${X11_X11_LIB} ${X11_Xinput_LIB}")
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -325,6 +323,7 @@
SET(PLATFORM_LINKFLAGS "-pthread")
# Better warnings
+ # note: -Wunused-parameter should be added but for now only apply to ./source/blender
SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas")
SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
@@ -341,7 +340,7 @@
# Setup 64bit and 64bit windows systems
IF(CMAKE_CL_64)
- message("64 bit compiler detected.")
+ MESSAGE("64 bit compiler detected.")
SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
ENDIF(CMAKE_CL_64)
@@ -369,15 +368,6 @@
SET(WINTAB_INC ${LIBDIR}/wintab/include)
- IF(WITH_PYTHON)
- SET(PYTHON ${LIBDIR}/python)
- SET(PYTHON_VERSION 3.1)
- SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
- # SET(PYTHON_BINARY python) # not used yet
- SET(PYTHON_LIB python31mw)
- SET(PYTHON_LIBPATH ${PYTHON}/lib)
- ENDIF(WITH_PYTHON)
-
IF(WITH_OPENAL)
SET(OPENAL ${LIBDIR}/openal)
SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
@@ -495,13 +485,15 @@
SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa)
- #pcre is bundled with openCollada
- #SET(PCRE ${LIBDIR}/pcre)
- #SET(PCRE_LIBPATH ${PCRE}/lib)
SET(PCRE_LIB pcre)
ENDIF(WITH_OPENCOLLADA)
- # TODO: IF(WITH_LCMS)
+ IF(WITH_LCMS)
+ SET(LCMS ${LIBDIR}/lcms)
+ SET(LCMS_INCLUDE_DIR ${LCMS}/include)
+ SET(LCMS_LIBPATH ${LCMS}/lib)
+ SET(LCMS_LIB lcms)
+ ENDIF(WITH_LCMS)
IF(WITH_FFMPEG)
SET(FFMPEG ${LIBDIR}/ffmpeg)
@@ -538,6 +530,15 @@
SET(JACK_LIBPATH ${JACK}/lib)
ENDIF(WITH_JACK)
+ IF(WITH_PYTHON)
+ SET(PYTHON ${LIBDIR}/python)
+ SET(PYTHON_VERSION 3.1)
+ SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+ # SET(PYTHON_BINARY python) # not used yet
+ SET(PYTHON_LIB python31)
+ SET(PYTHON_LIBPATH ${PYTHON}/lib)
+ ENDIF(WITH_PYTHON)
+
# MSVC only, Mingw doesnt need
IF(CMAKE_CL_64)
SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
@@ -557,6 +558,20 @@
ADD_DEFINITIONS(-DFREE_WINDOWS)
+ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+
+
+ SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
+ SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG")
+
+ SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -DNDEBUG")
+ SET(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -DNDEBUG")
+
+ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DNDEBUG")
+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DNDEBUG")
+
+
IF(WITH_OPENMP)
SET(LLIBS "${LLIBS} -lgomp")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
@@ -600,9 +615,6 @@
SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
SET(OPENCOLLADA_LIB OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
- #pcre is bundled with openCollada
- #SET(PCRE ${LIBDIR}/pcre)
- #SET(PCRE_LIBPATH ${PCRE}/lib)
SET(PCRE_LIB pcre)
ENDIF(WITH_OPENCOLLADA)
@@ -640,6 +652,15 @@
SET(WITH_JACK OFF)
ENDIF(WITH_JACK)
+ IF(WITH_PYTHON)
+ SET(PYTHON ${LIBDIR}/python)
+ SET(PYTHON_VERSION 3.1)
+ SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+ # SET(PYTHON_BINARY python) # not used yet
+ SET(PYTHON_LIB python31mw)
+ SET(PYTHON_LIBPATH ${PYTHON}/lib)
+ ENDIF(WITH_PYTHON)
+
ENDIF(MSVC)
ENDIF(WIN32)
@@ -923,9 +944,9 @@
#-----------------------------------------------------------------------------
# Libraries
FILE(WRITE ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "")
+ADD_SUBDIRECTORY(source)
ADD_SUBDIRECTORY(intern)
ADD_SUBDIRECTORY(extern)
-ADD_SUBDIRECTORY(source)
#-----------------------------------------------------------------------------
Modified: branches/soc-2010-jwilkins/COPYING
===================================================================
--- branches/soc-2010-jwilkins/COPYING 2011-05-24 22:51:11 UTC (rev 36886)
+++ branches/soc-2010-jwilkins/COPYING 2011-05-24 22:51:46 UTC (rev 36887)
@@ -2,7 +2,7 @@
to distribute or change the code.
Please read this file for the full license.
-doc/GPL-license.txt
+doc/license/GPL-license.txt
Apart from the GNU GPL, Blender is not available under other licenses.
Modified: branches/soc-2010-jwilkins/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2010-jwilkins/build_files/cmake/macros.cmake 2011-05-24 22:51:11 UTC (rev 36886)
+++ branches/soc-2010-jwilkins/build_files/cmake/macros.cmake 2011-05-24 22:51:46 UTC (rev 36887)
@@ -177,7 +177,13 @@
TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
ENDIF(WIN32)
ENDIF(WITH_OPENCOLLADA)
+ IF(WITH_LCMS)
IF(WIN32)
+ TARGET_LINK_LIBRARIES(${target} debug ${LCMS_LIB}_d)
+ TARGET_LINK_LIBRARIES(${target} optimized ${LCMS_LIB})
+ ENDIF(WIN32)
+ ENDIF(WITH_LCMS)
+ IF(WIN32)
TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
ENDIF(WIN32)
ENDMACRO(SETUP_LIBLINKS)
Modified: branches/soc-2010-jwilkins/build_files/scons/config/linux2-config.py
===================================================================
--- branches/soc-2010-jwilkins/build_files/scons/config/linux2-config.py 2011-05-24 22:51:11 UTC (rev 36886)
+++ branches/soc-2010-jwilkins/build_files/scons/config/linux2-config.py 2011-05-24 22:51:46 UTC (rev 36887)
@@ -23,9 +23,11 @@
BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
BF_LIBSAMPLERATE = '/usr'
+WITH_BF_STATICLIBSAMPLERATE = False
BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
BF_LIBSAMPLERATE_LIB = 'samplerate'
BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+BF_LIBSAMPLERATE_LIB_STATIC = '${BF_LIBSAMPLERATE}/lib/libsamplerate.a'
WITH_BF_JACK = False
BF_JACK = '/usr'
@@ -34,10 +36,12 @@
BF_JACK_LIBPATH = '${BF_JACK}/lib'
WITH_BF_SNDFILE = False
+WITH_BF_STATICSNDFILE = False
BF_SNDFILE = '/usr'
BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
BF_SNDFILE_LIB = 'sndfile'
BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+BF_SNDFILE_LIB_STATIC = '${BF_SNDFILE}/lib/libsndfile.a ${BF_OGG}/lib/libvorbis.a ${BF_OGG}/lib/libFLAC.a ${BF_OGG}/lib/libvorbisenc.a ${BF_OGG}/lib/libogg.a'
WITH_BF_SDL = True
BF_SDL = '/usr' #$(shell sdl-config --prefix)
@@ -136,10 +140,12 @@
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
WITH_BF_FFTW3 = False
-BF_FFTW3 = LIBDIR + '/usr'
+WITH_BF_STATICFFTW3 = False
+BF_FFTW3 = '/usr'
BF_FFTW3_INC = '${BF_FFTW3}/include'
BF_FFTW3_LIB = 'fftw3'
BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+BF_FFTW3_LIB_STATIC = '${BF_FFTW3_LIBPATH}/libfftw3.a'
WITH_BF_REDCODE = False
BF_REDCODE = '#extern/libredcode'
@@ -201,7 +207,7 @@
##ARFLAGS = ruv
##ARFLAGSQUIET = ru
##
-C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement']
+C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wunused-parameter']
CC_WARN = ['-Wall']
CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
Modified: branches/soc-2010-jwilkins/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2010-jwilkins/build_files/scons/config/win32-vc-config.py 2011-05-24 22:51:11 UTC (rev 36886)
+++ branches/soc-2010-jwilkins/build_files/scons/config/win32-vc-config.py 2011-05-24 22:51:46 UTC (rev 36887)
@@ -149,6 +149,12 @@
BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa'
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+WITH_BF_LCMS = True
+BF_LCMS = LIBDIR + '/lcms'
+BF_LCMS_INC = '${BF_LCMS}/include'
+BF_LCMS_LIB = 'lcms'
+BF_LCMS_LIBPATH = '${BF_LCMS}/lib'
+
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
@@ -191,7 +197,6 @@
# BF_PROFILE_LINKFLAGS = ['-pg']
# BF_PROFILE = False
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list