[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36904] branches/soc-2010-jwilkins: Merged with trunk: 34340-34892

[Jason Wilkins]

Revision: 36904
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36904
Author:   jwilkins
Date:     2011-05-26 05:39:40 +0000 (Thu, 26 May 2011)
Log Message:
-----------
Merged with trunk: 34340-34892

Modified Paths:
--------------
    branches/soc-2010-jwilkins/CMakeLists.txt
    branches/soc-2010-jwilkins/SConstruct
    branches/soc-2010-jwilkins/build_files/cmake/cmake_consistency_check.py
    branches/soc-2010-jwilkins/build_files/cmake/cmake_qtcreator_project.py
    branches/soc-2010-jwilkins/build_files/cmake/macros.cmake
    branches/soc-2010-jwilkins/build_files/package_spec/pacman/PKGBUILD
    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/doc/build_systems/cmake.txt
    branches/soc-2010-jwilkins/doc/manpage/blender.1
    branches/soc-2010-jwilkins/doc/python_api/examples/bpy.data.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/sphinx_doc_gen.py
    branches/soc-2010-jwilkins/doc/python_api/sphinx_doc_gen.sh
    branches/soc-2010-jwilkins/extern/CMakeLists.txt
    branches/soc-2010-jwilkins/extern/Eigen2/Eigen/Core
    branches/soc-2010-jwilkins/extern/bullet2/CMakeLists.txt
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
    branches/soc-2010-jwilkins/intern/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/SConscript
    branches/soc-2010-jwilkins/intern/audaspace/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
    branches/soc-2010-jwilkins/intern/elbeem/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/ghost/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
    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_WindowCocoa.mm
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowWin32.h
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2010-jwilkins/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2010-jwilkins/intern/guardedalloc/intern/mallocn.c
    branches/soc-2010-jwilkins/intern/iksolver/intern/IK_QSegment.h
    branches/soc-2010-jwilkins/intern/memutil/MEM_Allocator.h
    branches/soc-2010-jwilkins/intern/memutil/MEM_CacheLimiter.h
    branches/soc-2010-jwilkins/intern/memutil/MEM_CacheLimiterC-Api.h
    branches/soc-2010-jwilkins/intern/memutil/MEM_RefCounted.h
    branches/soc-2010-jwilkins/intern/memutil/MEM_RefCountedC-Api.h
    branches/soc-2010-jwilkins/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
    branches/soc-2010-jwilkins/intern/smoke/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/smoke/intern/FLUID_3D.cpp
    branches/soc-2010-jwilkins/intern/tools/bpy_introspect_ui.py
    branches/soc-2010-jwilkins/intern/tools/dump_rna2xml.py
    branches/soc-2010-jwilkins/intern/tools/pydna.py
    branches/soc-2010-jwilkins/release/bin/blender-thumbnailer.py
    branches/soc-2010-jwilkins/release/scripts/io/netrender/client.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/ui.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/add_object_utils.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/console/__init__.py
    branches/soc-2010-jwilkins/release/scripts/modules/console/complete_calltip.py
    branches/soc-2010-jwilkins/release/scripts/modules/console/complete_import.py
    branches/soc-2010-jwilkins/release/scripts/modules/console/complete_namespace.py
    branches/soc-2010-jwilkins/release/scripts/modules/console/intellisense.py
    branches/soc-2010-jwilkins/release/scripts/op/add_mesh_torus.py
    branches/soc-2010-jwilkins/release/scripts/op/animsys_update.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/mesh.py
    branches/soc-2010-jwilkins/release/scripts/op/nla.py
    branches/soc-2010-jwilkins/release/scripts/op/object.py
    branches/soc-2010-jwilkins/release/scripts/op/object_align.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/uvcalc_follow_active.py
    branches/soc-2010-jwilkins/release/scripts/op/uvcalc_smart_project.py
    branches/soc-2010-jwilkins/release/scripts/op/vertexpaint_dirt.py
    branches/soc-2010-jwilkins/release/scripts/op/wm.py
    branches/soc-2010-jwilkins/release/scripts/templates/addon_add_object.py
    branches/soc-2010-jwilkins/release/scripts/templates/background_job.py
    branches/soc-2010-jwilkins/release/scripts/templates/builtin_keyingset.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_export.py
    branches/soc-2010-jwilkins/release/scripts/templates/operator_mesh_add.py
    branches/soc-2010-jwilkins/release/scripts/templates/operator_modal.py
    branches/soc-2010-jwilkins/release/scripts/templates/operator_modal_draw.py
    branches/soc-2010-jwilkins/release/scripts/templates/operator_modal_view3d.py
    branches/soc-2010-jwilkins/release/scripts/templates/operator_simple.py
    branches/soc-2010-jwilkins/release/scripts/templates/operator_uv.py
    branches/soc-2010-jwilkins/release/scripts/templates/panel_simple.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_animviz.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_data_armature.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_data_bone.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_data_camera.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_data_curve.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_data_empty.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_data_lamp.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_data_lattice.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_data_mesh.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_data_metaball.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_data_modifier.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_game.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_material.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_object.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_object_constraint.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_particle.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_cloth.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_common.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_field.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_fluid.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_smoke.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_softbody.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/properties_world.py
    branches/soc-2010-jwilkins/release/scripts/ui/space_console.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_graph.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_logic.py
    branches/soc-2010-jwilkins/release/scripts/ui/space_nla.py
    branches/soc-2010-jwilkins/release/scripts/ui/space_node.py
    branches/soc-2010-jwilkins/release/scripts/ui/space_outliner.py
    branches/soc-2010-jwilkins/release/scripts/ui/space_sequencer.py
    branches/soc-2010-jwilkins/release/scripts/ui/space_text.py
    branches/soc-2010-jwilkins/release/scripts/ui/space_time.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/source/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/avi/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/blenfont/intern/blf.c
    branches/soc-2010-jwilkins/source/blender/blenfont/intern/blf_dir.c
    branches/soc-2010-jwilkins/source/blender/blenfont/intern/blf_font.c
    branches/soc-2010-jwilkins/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2010-jwilkins/source/blender/blenfont/intern/blf_internal.h
    branches/soc-2010-jwilkins/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2010-jwilkins/source/blender/blenfont/intern/blf_util.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_armature.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_deform.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_global.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_idprop.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_key.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_multires.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_node.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_paint.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_particle.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_pointcache.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_scene.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_subsurf.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_texture.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/CCGSubSurf.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/action.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/bmfont.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/collision.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/deform.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/depsgraph.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/fcurve.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/font.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/icons.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/idcode.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/image_gen.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/implicit.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/ipo.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/key.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/material.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/mball.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/multires.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/nla.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/property.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/report.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/sca.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/scene.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/screen.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/seqcache.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/sketch.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/smoke.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/softbody.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/suggestions.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/texture.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/unit.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/world.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/writeavi.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/writeframeserver.c
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_boxpack2d.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_bpath.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_ghash.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_jitter.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_mempool.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_noise.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_path_util.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_pbvh.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/BLI_string.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2010-jwilkins/source/blender/blenlib/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/BLI_args.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/BLI_heap.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/BLI_kdtree.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/BLI_mempool.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/boxpack2d.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/bpath.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/fileops.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/freetypefont.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/graph.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/jitter.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/listbase.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_geom.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_matrix.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/noise.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/rct.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/scanfill.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/storage.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/string.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/threads.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/time.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/uvproject.c
    branches/soc-2010-jwilkins/source/blender/blenloader/BLO_readfile.h
    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/readfile.c
    branches/soc-2010-jwilkins/source/blender/blenloader/intern/writefile.c
    branches/soc-2010-jwilkins/source/blender/collada/AnimationImporter.cpp
    branches/soc-2010-jwilkins/source/blender/collada/ArmatureExporter.cpp
    branches/soc-2010-jwilkins/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2010-jwilkins/source/blender/collada/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/collada/DocumentExporter.cpp
    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/GeometryExporter.cpp
    branches/soc-2010-jwilkins/source/blender/collada/GeometryExporter.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/TransformReader.cpp
    branches/soc-2010-jwilkins/source/blender/collada/collada.cpp
    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/editors/animation/anim_channels_defines.c
    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_ipo_utils.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/fmodifier_ui.c
    branches/soc-2010-jwilkins/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/animation/keyframes_edit.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_retarget.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/poselib.c
    branches/soc-2010-jwilkins/source/blender/editors/armature/poseobject.c
    branches/soc-2010-jwilkins/source/blender/editors/armature/reeb.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/gpencil/editaction_gpencil.c
    branches/soc-2010-jwilkins/source/blender/editors/gpencil/gpencil_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/gpencil/gpencil_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_curve.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_keyframing.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_markers.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_mesh.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_screen.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_sculpt.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_types.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_util.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_uvedit.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_view3d.h
    branches/soc-2010-jwilkins/source/blender/editors/include/UI_interface.h
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface.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/resources.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/editface.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_loop.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/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/metaball/mball_ops.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_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/object/object_lattice.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_ops.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_transform.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_vgroup.c
    branches/soc-2010-jwilkins/source/blender/editors/physics/particle_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/physics/physics_fluid.c
    branches/soc-2010-jwilkins/source/blender/editors/physics/physics_pointcache.c
    branches/soc-2010-jwilkins/source/blender/editors/render/render_internal.c
    branches/soc-2010-jwilkins/source/blender/editors/render/render_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/render/render_shading.c
    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/sculpt_paint/paint_image.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.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/sculpt_paint/sculpt_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/soc-2010-jwilkins/source/blender/editors/sound/sound_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_action/action_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_action/action_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_action/action_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_action/action_ops.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/spacetypes.c
    branches/soc-2010-jwilkins/source/blender/editors/space_buttons/buttons_context.c
    branches/soc-2010-jwilkins/source/blender/editors/space_buttons/buttons_header.c
    branches/soc-2010-jwilkins/source/blender/editors/space_buttons/buttons_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_console/console_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_console/console_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_console/space_console.c
    branches/soc-2010-jwilkins/source/blender/editors/space_file/file_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_file/file_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_file/filelist.c
    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/graph_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_intern.h
    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/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_intern.h
    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/info_stats.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/space_info.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/nla_channels.c
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_select.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/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/space_node/drawnode.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_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_select.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/space_node.c
    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_header.c
    branches/soc-2010-jwilkins/source/blender/editors/space_script/space_script.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_add.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/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/space_time.c
    branches/soc-2010-jwilkins/source/blender/editors/space_time/time_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_userpref/space_userpref.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_toolbar.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2010-jwilkins/source/blender/editors/transform/transform.c
    branches/soc-2010-jwilkins/source/blender/editors/transform/transform_constraints.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_input.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/ed_util.c
    branches/soc-2010-jwilkins/source/blender/editors/util/editmode_undo.c
    branches/soc-2010-jwilkins/source/blender/editors/util/undo.c
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2010-jwilkins/source/blender/gpu/GPU_buffers.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/gpu/intern/gpu_shader_material.glsl
    branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_shader_vertex.glsl
    branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_shader_vertex.glsl.c
    branches/soc-2010-jwilkins/source/blender/imbuf/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/imbuf/IMB_imbuf_types.h
    branches/soc-2010-jwilkins/source/blender/imbuf/IMB_thumbs.h
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/allocimbuf.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/divers.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/jp2.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/thumbs.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/tiff.c
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_ID.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_action_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_armature_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_constraint_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_ipo_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_lamp_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_node_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_object_force.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_object_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_screen_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_view3d_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/intern/dna_genfile.c
    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/RNA_enum_types.h
    branches/soc-2010-jwilkins/source/blender/makesrna/RNA_types.h
    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_action.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_actuator.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_brush.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_fcurve.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_fluidsim.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_image_api.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_key.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_mesh_api.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_nla.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_object_api.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_render.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_scene_api.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_screen.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sensor.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_texture.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_ui.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/modifiers/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/modifiers/SConscript
    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_boolean_util.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/CMP_node.h
    branches/soc-2010-jwilkins/source/blender/nodes/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/nodes/SHD_node.h
    branches/soc-2010-jwilkins/source/blender/nodes/TEX_node.h
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_bilateralblur.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_brightness.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_crop.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_dilate.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_directionalblur.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_distanceMatte.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_filter.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_flip.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_idMask.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_image.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_invert.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_lensdist.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_mapValue.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_math.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_mixrgb.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_normal.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_premulkey.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_sepcombRGBA.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYUVA.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_setalpha.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_translate.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_valToRgb.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_value.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_util.h
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_material.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_math.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_output.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_value.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_util.h
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_at.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_compose.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_coord.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_image.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_invert.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_math.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_output.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_util.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_util.h
    branches/soc-2010-jwilkins/source/blender/nodes/intern/node_util.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/node_util.h
    branches/soc-2010-jwilkins/source/blender/python/generic/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/python/generic/IDProp.c
    branches/soc-2010-jwilkins/source/blender/python/generic/IDProp.h
    branches/soc-2010-jwilkins/source/blender/python/generic/bgl.c
    branches/soc-2010-jwilkins/source/blender/python/generic/bgl.h
    branches/soc-2010-jwilkins/source/blender/python/generic/blf_py_api.c
    branches/soc-2010-jwilkins/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils.h
    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/CMakeLists.txt
    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_app.h
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_driver.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.h
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_operator_wrap.h
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_props.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_props.h
    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_array.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_rna_callback.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_rna_callback.h
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_util.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_util.h
    branches/soc-2010-jwilkins/source/blender/python/rna_dump.py
    branches/soc-2010-jwilkins/source/blender/render/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/render/SConscript
    branches/soc-2010-jwilkins/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2010-jwilkins/source/blender/render/extern/include/RE_shader_ext.h
    branches/soc-2010-jwilkins/source/blender/render/intern/include/raycounter.h
    branches/soc-2010-jwilkins/source/blender/render/intern/include/rayobject.h
    branches/soc-2010-jwilkins/source/blender/render/intern/include/render_types.h
    branches/soc-2010-jwilkins/source/blender/render/intern/include/rendercore.h
    branches/soc-2010-jwilkins/source/blender/render/intern/include/texture.h
    branches/soc-2010-jwilkins/source/blender/render/intern/include/volumetric.h
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/bvh.h
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/rayobject.cpp
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/rayobject_hint.h
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/reorganize.h
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/svbvh.h
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/vbvh.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/strand.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/volume_precache.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/volumetric.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/CMakeLists.txt
    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_cursors.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_init_exit.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/wm_files.h
    branches/soc-2010-jwilkins/source/blender/windowmanager/wm_window.h
    branches/soc-2010-jwilkins/source/blenderplayer/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/creator.c
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    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/BL_ModifierDeformer.h
    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/KX_ConvertControllers.cpp
    branches/soc-2010-jwilkins/source/gameengine/Expressions/Value.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_DelaySensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_IController.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_GameActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_WorldInfo.h
    branches/soc-2010-jwilkins/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2010-jwilkins/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_Deformer.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

Added Paths:
-----------
    branches/soc-2010-jwilkins/GNUmakefile
    branches/soc-2010-jwilkins/build_files/cmake/RpmBuild.cmake
    branches/soc-2010-jwilkins/build_files/cmake/packaging.cmake
    branches/soc-2010-jwilkins/build_files/package_spec/build_debian.sh
    branches/soc-2010-jwilkins/build_files/package_spec/debian/
    branches/soc-2010-jwilkins/build_files/package_spec/debian/changelog
    branches/soc-2010-jwilkins/build_files/package_spec/debian/compat
    branches/soc-2010-jwilkins/build_files/package_spec/debian/control
    branches/soc-2010-jwilkins/build_files/package_spec/debian/copyright
    branches/soc-2010-jwilkins/build_files/package_spec/debian/docs
    branches/soc-2010-jwilkins/build_files/package_spec/debian/menu
    branches/soc-2010-jwilkins/build_files/package_spec/debian/rules
    branches/soc-2010-jwilkins/build_files/package_spec/debian/source/
    branches/soc-2010-jwilkins/build_files/package_spec/debian/source/format
    branches/soc-2010-jwilkins/build_files/package_spec/debian/watch
    branches/soc-2010-jwilkins/extern/bullet2/uninitialized_stack_vec.patch
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_TaskbarWin32.h
    branches/soc-2010-jwilkins/intern/mikktspace/
    branches/soc-2010-jwilkins/intern/mikktspace/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/mikktspace/SConscript
    branches/soc-2010-jwilkins/intern/mikktspace/mikktspace.c
    branches/soc-2010-jwilkins/intern/mikktspace/mikktspace.h
    branches/soc-2010-jwilkins/release/scripts/modules/keyingsets_utils.py
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/23.98.py
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/24.py
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/25.py
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/29.97.py
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/30.py
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/50.py
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/59.94.py
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/60.py
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/Custom.py
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2010-jwilkins/source/blender/editors/util/crazyspace.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Color.h
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Euler.h
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Matrix.h
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Quaternion.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Quaternion.h
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Vector.h
    branches/soc-2010-jwilkins/source/blender/python/generic/noise_py_api.c
    branches/soc-2010-jwilkins/source/blender/python/generic/noise_py_api.h
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_driver.h
    branches/soc-2010-jwilkins/source/blender/render/intern/include/rayintersection.h
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/rayobject_empty.cpp
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/rayobject_instance.cpp
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/rayobject_internal.h
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/rayobject_raycounter.cpp
    branches/soc-2010-jwilkins/source/blender/render/intern/source/render_texture.c
    branches/soc-2010-jwilkins/source/tests/
    branches/soc-2010-jwilkins/source/tests/CMakeLists.txt
    branches/soc-2010-jwilkins/source/tests/batch_import.py
    branches/soc-2010-jwilkins/source/tests/bl_test.py
    branches/soc-2010-jwilkins/source/tests/pep8.py
    branches/soc-2010-jwilkins/source/tests/rna_array.py
    branches/soc-2010-jwilkins/source/tests/rna_info_dump.py

Removed Paths:
-------------
    branches/soc-2010-jwilkins/Makefile
    branches/soc-2010-jwilkins/build_files/make/
    branches/soc-2010-jwilkins/build_files/package_spec/debian/changelog
    branches/soc-2010-jwilkins/build_files/package_spec/debian/compat
    branches/soc-2010-jwilkins/build_files/package_spec/debian/control
    branches/soc-2010-jwilkins/build_files/package_spec/debian/copyright
    branches/soc-2010-jwilkins/build_files/package_spec/debian/docs
    branches/soc-2010-jwilkins/build_files/package_spec/debian/menu
    branches/soc-2010-jwilkins/build_files/package_spec/debian/rules
    branches/soc-2010-jwilkins/build_files/package_spec/debian/source/
    branches/soc-2010-jwilkins/build_files/package_spec/debian/source/format
    branches/soc-2010-jwilkins/build_files/package_spec/debian/watch
    branches/soc-2010-jwilkins/doc/build_systems/README.windows-gcc
    branches/soc-2010-jwilkins/extern/Makefile
    branches/soc-2010-jwilkins/extern/binreloc/Makefile
    branches/soc-2010-jwilkins/extern/bullet2/Makefile
    branches/soc-2010-jwilkins/extern/bullet2/src/Makefile
    branches/soc-2010-jwilkins/extern/glew/src/Makefile
    branches/soc-2010-jwilkins/extern/libopenjpeg/Makefile
    branches/soc-2010-jwilkins/extern/lzma/Makefile
    branches/soc-2010-jwilkins/extern/lzo/minilzo/Makefile
    branches/soc-2010-jwilkins/intern/Makefile
    branches/soc-2010-jwilkins/intern/audaspace/FX/Makefile
    branches/soc-2010-jwilkins/intern/audaspace/Makefile
    branches/soc-2010-jwilkins/intern/audaspace/OpenAL/Makefile
    branches/soc-2010-jwilkins/intern/audaspace/Python/Makefile
    branches/soc-2010-jwilkins/intern/audaspace/SDL/Makefile
    branches/soc-2010-jwilkins/intern/audaspace/SRC/Makefile
    branches/soc-2010-jwilkins/intern/audaspace/ffmpeg/Makefile
    branches/soc-2010-jwilkins/intern/audaspace/fftw/Makefile
    branches/soc-2010-jwilkins/intern/audaspace/intern/Makefile
    branches/soc-2010-jwilkins/intern/audaspace/jack/Makefile
    branches/soc-2010-jwilkins/intern/audaspace/sndfile/Makefile
    branches/soc-2010-jwilkins/intern/boolop/Makefile
    branches/soc-2010-jwilkins/intern/boolop/intern/Makefile
    branches/soc-2010-jwilkins/intern/bsp/Makefile
    branches/soc-2010-jwilkins/intern/bsp/intern/Makefile
    branches/soc-2010-jwilkins/intern/bsp/test/BSP_GhostTest/Makefile
    branches/soc-2010-jwilkins/intern/bsp/test/Makefile
    branches/soc-2010-jwilkins/intern/container/Makefile
    branches/soc-2010-jwilkins/intern/container/intern/Makefile
    branches/soc-2010-jwilkins/intern/decimation/Makefile
    branches/soc-2010-jwilkins/intern/decimation/intern/Makefile
    branches/soc-2010-jwilkins/intern/decimation/test/Makefile
    branches/soc-2010-jwilkins/intern/decimation/test/decimate_glut_test/Makefile
    branches/soc-2010-jwilkins/intern/decimation/test/decimate_glut_test/intern/Makefile
    branches/soc-2010-jwilkins/intern/decimation/test/decimate_glut_test/intern/common/Makefile
    branches/soc-2010-jwilkins/intern/decimation/test/decimate_glut_test/intern/ply/Makefile
    branches/soc-2010-jwilkins/intern/elbeem/Makefile
    branches/soc-2010-jwilkins/intern/elbeem/intern/Makefile
    branches/soc-2010-jwilkins/intern/ghost/Makefile
    branches/soc-2010-jwilkins/intern/ghost/intern/Makefile
    branches/soc-2010-jwilkins/intern/ghost/test/Makefile
    branches/soc-2010-jwilkins/intern/ghost/test/gears/Makefile
    branches/soc-2010-jwilkins/intern/ghost/test/multitest/Makefile
    branches/soc-2010-jwilkins/intern/guardedalloc/Makefile
    branches/soc-2010-jwilkins/intern/guardedalloc/intern/Makefile
    branches/soc-2010-jwilkins/intern/guardedalloc/test/Makefile
    branches/soc-2010-jwilkins/intern/guardedalloc/test/simpletest/Makefile
    branches/soc-2010-jwilkins/intern/iksolver/Makefile
    branches/soc-2010-jwilkins/intern/iksolver/intern/Makefile
    branches/soc-2010-jwilkins/intern/iksolver/test/Makefile
    branches/soc-2010-jwilkins/intern/iksolver/test/ik_glut_test/Makefile
    branches/soc-2010-jwilkins/intern/iksolver/test/ik_glut_test/common/Makefile
    branches/soc-2010-jwilkins/intern/iksolver/test/ik_glut_test/intern/Makefile
    branches/soc-2010-jwilkins/intern/itasc/Makefile
    branches/soc-2010-jwilkins/intern/itasc/kdl/Makefile
    branches/soc-2010-jwilkins/intern/itasc/kdl/utilities/Makefile
    branches/soc-2010-jwilkins/intern/memutil/Makefile
    branches/soc-2010-jwilkins/intern/memutil/intern/Makefile
    branches/soc-2010-jwilkins/intern/mikktspace/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/mikktspace/SConscript
    branches/soc-2010-jwilkins/intern/mikktspace/mikktspace.c
    branches/soc-2010-jwilkins/intern/mikktspace/mikktspace.h
    branches/soc-2010-jwilkins/intern/moto/Makefile
    branches/soc-2010-jwilkins/intern/moto/intern/Makefile
    branches/soc-2010-jwilkins/intern/opennl/Makefile
    branches/soc-2010-jwilkins/intern/opennl/intern/Makefile
    branches/soc-2010-jwilkins/intern/opennl/superlu/Makefile
    branches/soc-2010-jwilkins/intern/smoke/Makefile
    branches/soc-2010-jwilkins/intern/smoke/intern/Makefile
    branches/soc-2010-jwilkins/intern/string/Makefile
    branches/soc-2010-jwilkins/intern/string/intern/Makefile
    branches/soc-2010-jwilkins/po/Makefile
    branches/soc-2010-jwilkins/release/Makefile
    branches/soc-2010-jwilkins/release/getversion.py
    branches/soc-2010-jwilkins/release/scripts/keyingsets/keyingsets_utils.py
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/23.98.py
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/24.py
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/25.py
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/29.97.py
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/30.py
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/50.py
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/59.94.py
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/60.py
    branches/soc-2010-jwilkins/release/scripts/presets/framerate/Custom.py
    branches/soc-2010-jwilkins/release/test/
    branches/soc-2010-jwilkins/source/Makefile
    branches/soc-2010-jwilkins/source/blender/Makefile
    branches/soc-2010-jwilkins/source/blender/avi/Makefile
    branches/soc-2010-jwilkins/source/blender/avi/intern/Makefile
    branches/soc-2010-jwilkins/source/blender/blenfont/Makefile
    branches/soc-2010-jwilkins/source/blender/blenfont/intern/Makefile
    branches/soc-2010-jwilkins/source/blender/blenkernel/Makefile
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/Makefile
    branches/soc-2010-jwilkins/source/blender/blenlib/Makefile
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/Makefile
    branches/soc-2010-jwilkins/source/blender/blenloader/Makefile
    branches/soc-2010-jwilkins/source/blender/blenloader/intern/Makefile
    branches/soc-2010-jwilkins/source/blender/blenpluginapi/Makefile
    branches/soc-2010-jwilkins/source/blender/blenpluginapi/intern/Makefile
    branches/soc-2010-jwilkins/source/blender/collada/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/animation/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/armature/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/curve/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/datafiles/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/gpencil/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/interface/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/mesh/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/metaball/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/object/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/physics/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/render/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/screen/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/sound/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_action/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_api/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_buttons/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_console/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_file/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_image/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_info/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_logic/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_node/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_outliner/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_script/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_sound/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_text/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_time/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_userpref/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/transform/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/util/Makefile
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/Makefile
    branches/soc-2010-jwilkins/source/blender/gpu/Makefile
    branches/soc-2010-jwilkins/source/blender/gpu/intern/Makefile
    branches/soc-2010-jwilkins/source/blender/ikplugin/Makefile
    branches/soc-2010-jwilkins/source/blender/ikplugin/intern/Makefile
    branches/soc-2010-jwilkins/source/blender/imbuf/Makefile
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/Makefile
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/cineon/Makefile
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/dds/Makefile
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/openexr/Makefile
    branches/soc-2010-jwilkins/source/blender/makesdna/Makefile
    branches/soc-2010-jwilkins/source/blender/makesdna/intern/Makefile
    branches/soc-2010-jwilkins/source/blender/makesrna/Makefile
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/Makefile
    branches/soc-2010-jwilkins/source/blender/modifiers/Makefile
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/Makefile
    branches/soc-2010-jwilkins/source/blender/nodes/Makefile
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/Makefile
    branches/soc-2010-jwilkins/source/blender/nodes/intern/Makefile
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/Makefile
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/Makefile
    branches/soc-2010-jwilkins/source/blender/python/Makefile
    branches/soc-2010-jwilkins/source/blender/python/generic/Makefile
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_color.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_color.h
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_euler.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_euler.h
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_matrix.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_matrix.h
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_quat.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_quat.h
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_vector.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_vector.h
    branches/soc-2010-jwilkins/source/blender/python/generic/noise.c
    branches/soc-2010-jwilkins/source/blender/python/intern/Makefile
    branches/soc-2010-jwilkins/source/blender/quicktime/Makefile
    branches/soc-2010-jwilkins/source/blender/quicktime/apple/Makefile
    branches/soc-2010-jwilkins/source/blender/readblenfile/Makefile
    branches/soc-2010-jwilkins/source/blender/readblenfile/intern/Makefile
    branches/soc-2010-jwilkins/source/blender/readblenfile/stub/Makefile
    branches/soc-2010-jwilkins/source/blender/readblenfile/test/Makefile
    branches/soc-2010-jwilkins/source/blender/render/Makefile
    branches/soc-2010-jwilkins/source/blender/render/extern/include/RE_raytrace.h
    branches/soc-2010-jwilkins/source/blender/render/intern/Makefile
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/Makefile
    branches/soc-2010-jwilkins/source/blender/render/intern/source/Makefile
    branches/soc-2010-jwilkins/source/blender/render/intern/source/rayobject_blibvh.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/rayobject_instance.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/rayobject_octree.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/rayobject_raycounter.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/texture.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/Makefile
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/Makefile
    branches/soc-2010-jwilkins/source/blenderplayer/bad_level_call_stubs/Makefile
    branches/soc-2010-jwilkins/source/creator/Makefile
    branches/soc-2010-jwilkins/source/darwin/Makefile
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/Makefile
    branches/soc-2010-jwilkins/source/gameengine/Converter/Makefile
    branches/soc-2010-jwilkins/source/gameengine/Expressions/Makefile
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/Joystick/Makefile
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/Makefile
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/Makefile
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/common/Makefile
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/ghost/Makefile
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/Makefile
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/Makefile
    branches/soc-2010-jwilkins/source/gameengine/Makefile
    branches/soc-2010-jwilkins/source/gameengine/Network/LoopBackNetwork/Makefile
    branches/soc-2010-jwilkins/source/gameengine/Network/Makefile
    branches/soc-2010-jwilkins/source/gameengine/Network/TerraplayNetwork/Makefile
    branches/soc-2010-jwilkins/source/gameengine/Physics/Bullet/Makefile
    branches/soc-2010-jwilkins/source/gameengine/Physics/Dummy/Makefile
    branches/soc-2010-jwilkins/source/gameengine/Physics/Makefile
    branches/soc-2010-jwilkins/source/gameengine/Physics/common/Makefile
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/Makefile
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
    branches/soc-2010-jwilkins/source/gameengine/SceneGraph/Makefile
    branches/soc-2010-jwilkins/source/gameengine/VideoTexture/Makefile
    branches/soc-2010-jwilkins/source/icons/Makefile
    branches/soc-2010-jwilkins/source/kernel/Makefile
    branches/soc-2010-jwilkins/source/kernel/gen_messaging/Makefile
    branches/soc-2010-jwilkins/source/kernel/gen_messaging/intern/Makefile
    branches/soc-2010-jwilkins/source/kernel/gen_system/Makefile
    branches/soc-2010-jwilkins/source/tests/CMakeLists.txt
    branches/soc-2010-jwilkins/source/tests/batch_import.py
    branches/soc-2010-jwilkins/source/tests/bl_test.py
    branches/soc-2010-jwilkins/source/tests/pep8.py
    branches/soc-2010-jwilkins/source/tests/rna_array.py
    branches/soc-2010-jwilkins/source/tests/rna_info_dump.py
    branches/soc-2010-jwilkins/source/tools/guess/

Property Changed:
----------------
    branches/soc-2010-jwilkins/
    branches/soc-2010-jwilkins/build_files/package_spec/pacman/PKGBUILD
    branches/soc-2010-jwilkins/build_files/package_spec/pacman/blender.install


Property changes on: branches/soc-2010-jwilkins
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:30832-32508,33093-34339
   + /trunk/blender:30832-32508,33093-34892

Modified: branches/soc-2010-jwilkins/CMakeLists.txt
===================================================================
--- branches/soc-2010-jwilkins/CMakeLists.txt	2011-05-26 05:35:30 UTC (rev 36903)
+++ branches/soc-2010-jwilkins/CMakeLists.txt	2011-05-26 05:39:40 UTC (rev 36904)
@@ -50,6 +50,8 @@
 
 project(Blender)
 
+enable_testing()
+
 #-----------------------------------------------------------------------------
 # Redirect output files
 
@@ -165,9 +167,9 @@
 
 # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
 # On Unix: 
-#   cmake -D PYTHON_LIB=/usr/local/lib/python3.1/config/libpython3.1.so -D PYTHON_INC=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
+#   cmake -D PYTHON_LIBRARY=/usr/local/lib/python3.1/config/libpython3.1.so -D PYTHON_INCLUDE_DIRS=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
 # 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
+#   cmake -D PYTHON_INCLUDE_DIRS=/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/build_systems/cmake.txt
 
@@ -225,12 +227,13 @@
 		# No way to set py31. remove for now.
 		# find_package(PythonLibs)
 		set(PYTHON /usr)
-		set(PYTHON_VERSION 3.1)
-		set(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
-		mark_as_advanced(PYTHON_INC)
+		set(PYTHON_VERSION 3.1 CACHE STRING "")
+		mark_as_advanced(PYTHON_VERSION)
+		set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+		mark_as_advanced(PYTHON_INCLUDE_DIRS)
 		# set(PYTHON_BINARY python) # not used yet
-		set(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
-		mark_as_advanced(PYTHON_LIB)
+		set(PYTHON_LIBRARY python${PYTHON_VERSION} CACHE STRING "")
+		mark_as_advanced(PYTHON_LIBRARY)
 		set(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
 		mark_as_advanced(PYTHON_LIBPATH)
 		# find_package(PythonInterp) # not used yet
@@ -245,6 +248,7 @@
 		mark_as_advanced(SDLMAIN_LIBRARY)
 		mark_as_advanced(SDL_INCLUDE_DIR)
 		mark_as_advanced(SDL_LIBRARY)
+		mark_as_advanced(SDL_LIBRARY_TEMP)
 		# unset(SDLMAIN_LIBRARY CACHE)
 		if(NOT SDL_FOUND)
 			set(WITH_SDL OFF)
@@ -415,12 +419,12 @@
 	endif()
 
 	set(PNG "${LIBDIR}/png")
-	set(PNG_INC "${PNG}/include")
-	set(PNG_LIBPATH ${PNG}/lib)
+	set(PNG_INCLUDE_DIR "${PNG}/include")
+	set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
 
 	set(JPEG "${LIBDIR}/jpeg")
-	set(JPEG_INC "${JPEG}/include")
-	set(JPEG_LIBPATH ${JPEG}/lib)
+	set(JPEG_INCLUDE_DIR "${JPEG}/include")
+	set(JPEG_LIBPATH ${JPEG}/lib) # not cmake defined
 
 	set(WINTAB_INC ${LIBDIR}/wintab/include) 
 
@@ -503,10 +507,10 @@
 		else()
 			set(PNG_LIBRARIES libpng_st)
 		endif()
-		set(JPEG_LIBRARY libjpeg)
+		set(JPEG_LIBRARIES libjpeg)
 
 		set(ZLIB ${LIBDIR}/zlib)
-		set(ZLIB_INC ${ZLIB}/include)
+		set(ZLIB_INCLUDE_DIRS ${ZLIB}/include)
 		set(ZLIB_LIBPATH ${ZLIB}/lib)
 		if(CMAKE_CL_64)
 			set(ZLIB_LIBRARIES libz)
@@ -535,7 +539,7 @@
 			set(OPENCOLLADA ${LIBDIR}/opencollada)
 			set(OPENCOLLADA_INC ${OPENCOLLADA}/include)
 			set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
-			set(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa)
+			set(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa UTF)
 			set(PCRE_LIB pcre)
 		endif()
 
@@ -554,18 +558,25 @@
 		endif()
         
 		if(WITH_IMAGE_OPENEXR)
-			set(OPENEXR ${LIBDIR}/openexr)
-			set(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
-			set(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
 			if(MSVC80)
-				set(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2005)
+				set(MSVC_LIB _vs2005)
+				set(MSVC_INC)
+			elseif(MSVC90)
+				set(MSVC_LIB _vs2008)
+				set(MSVC_INC)
+			elseif(MSVC10)
+				set(MSVC_LIB _vs2010)
+				set(MSVC_INC _vs2010)
 			else()
-				set(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
+				set(MSVC_LIB msvc)
+				set(MSVC_INC)
 			endif()
-			if(MSVC90)
-				set(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
+			set(OPENEXR ${LIBDIR}/openexr)			
+			set(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
+			set(OPENEXR_LIBPATH ${OPENEXR}/lib${MSVC_LIB})
+			set(OPENEXR_INCUDE ${OPENEXR}/include${MSVC_INC})
+			set(OPENEXR_INC ${OPENEXR_INCUDE}/ ${OPENEXR_INCUDE}/IlmImf ${OPENEXR_INCUDE}/Iex ${OPENEXR_INCUDE}/Imath)
 			endif()
-		endif()
 
 		if(WITH_IMAGE_TIFF)
 			set(TIFF ${LIBDIR}/tiff)
@@ -584,9 +595,9 @@
 		if(WITH_PYTHON)
 			set(PYTHON ${LIBDIR}/python)
 			set(PYTHON_VERSION 3.1)
-			set(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+			set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}")
 			# set(PYTHON_BINARY python) # not used yet
-			set(PYTHON_LIB python31)
+			set(PYTHON_LIBRARY python31)
 			set(PYTHON_LIBPATH ${PYTHON}/lib)
 		endif()
 
@@ -621,11 +632,11 @@
 			set(GETTEXT_LIB intl)
 		endif()
 
-		set(JPEG_LIBRARY libjpeg)
+		set(JPEG_LIBRARIES libjpeg)
 		set(PNG_LIBRARIES png)
 
 		set(ZLIB ${LIBDIR}/zlib)
-		set(ZLIB_INC ${ZLIB}/include)
+		set(ZLIB_INCLUDE_DIRS ${ZLIB}/include)
 		set(ZLIB_LIBPATH ${ZLIB}/lib)
 		set(ZLIB_LIBRARIES z)
 
@@ -691,9 +702,9 @@
 		if(WITH_PYTHON)
 			set(PYTHON ${LIBDIR}/python)
 			set(PYTHON_VERSION 3.1)
-			set(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+			set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}")
 			# set(PYTHON_BINARY python) # not used yet
-			set(PYTHON_LIB python31mw)
+			set(PYTHON_LIBRARY python31mw)
 			set(PYTHON_LIBPATH ${PYTHON}/lib)
 		endif()
 
@@ -745,9 +756,9 @@
 		# we use precompiled libraries for py 3.1 and up by default
 
 		set(PYTHON ${LIBDIR}/python)
-		set(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+		set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}")
 		# set(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}") # not used yet
-		set(PYTHON_LIB python${PYTHON_VERSION})
+		set(PYTHON_LIBRARY python${PYTHON_VERSION})
 		set(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}")
 		# set(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
 	else()
@@ -755,9 +766,9 @@
 
 		set(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
 		set(PYTHON_VERSION 3.1)
-		set(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}")
+		set(PYTHON_INCLUDE_DIRS "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}")
 		# set(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}) # not used yet
-		set(PYTHON_LIB "")
+		set(PYTHON_LIBRARY "")
 		set(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config)
 		set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
 	endif()
@@ -777,10 +788,10 @@
 	endif()
 
 	set(PNG_LIBRARIES png)
-	set(JPEG_LIBRARY jpeg)
+	set(JPEG_LIBRARIES jpeg)
 
 	set(ZLIB /usr)
-	set(ZLIB_INC "${ZLIB}/include")
+	set(ZLIB_INCLUDE_DIRS "${ZLIB}/include")
 	set(ZLIB_LIBRARIES z bz2)
 
 	set(FREETYPE ${LIBDIR}/freetype)
@@ -860,11 +871,11 @@
 	endif()
 
 	set(PNG "${LIBDIR}/png")
-	set(PNG_INC "${PNG}/include")
+	set(PNG_INCLUDE_DIR "${PNG}/include")
 	set(PNG_LIBPATH ${PNG}/lib)
 
 	set(JPEG "${LIBDIR}/jpeg")
-	set(JPEG_INC "${JPEG}/include")
+	set(JPEG_INCLUDE_DIR "${JPEG}/include")
 	set(JPEG_LIBPATH ${JPEG}/lib)
 
 	if(WITH_IMAGE_TIFF)
@@ -936,9 +947,16 @@
 endif()
 
 if(WITH_IMAGE_OPENJPEG)
+	if(UNIX AND NOT APPLE)
+		set(OPENJPEG /usr)
+		set(OPENJPEG_INC ${OPENJPEG}/include)
+		set(OPENJPEG_LIB openjpeg)
+		set(OPENJPEG_LIBPATH ${OPENJPEG}/lib)
+	else()
 	set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
 	set(OPENJPEG_INC ${OPENJPEG})
 endif()
+endif()
 
 if(WITH_IMAGE_REDCODE)
 	set(REDCODE ${CMAKE_SOURCE_DIR}/extern)
@@ -1064,3 +1082,7 @@
 if(WITH_PLAYER)
 	add_subdirectory(source/blenderplayer)
 endif()
+
+#-----------------------------------------------------------------------------
+# CPack for generating packages
+include(build_files/cmake/packaging.cmake)

Copied: branches/soc-2010-jwilkins/GNUmakefile (from rev 34892, trunk/blender/GNUmakefile)
===================================================================
--- branches/soc-2010-jwilkins/GNUmakefile	                        (rev 0)
+++ branches/soc-2010-jwilkins/GNUmakefile	2011-05-26 05:39:40 UTC (rev 36904)
@@ -0,0 +1,88 @@
+# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
+# vim: tabstop=8
+# $Id$
+#
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# This Makefile does an out-of-source CMake build in ../build/`OS`_`CPU`
+# eg:
+#   ../build/Linux_i386
+# This is for users who like to configure & build blender with a single command.
+
+
+# System Vars
+OS:=$(shell uname -s)
+OS_NCASE:=$(shell uname -s | tr '[A-Z]' '[a-z]')
+# CPU:=$(shell uname -m)  # UNUSED
+
+
+# Source and Build DIR's
+BLENDER_DIR:=$(shell pwd -P)
+BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
+
+
+# Get the number of cores for threaded build
+NPROCS:=1
+ifeq ($(OS), Linux)
+	NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
+endif
+ifeq ($(OS), Darwin)

@@ Diff output truncated at 10240 characters. @@