[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36902] branches/soc-2010-jwilkins: Merged with trunk: 33704-34399

Jason Wilkins Jason.A.Wilkins at gmail.com
Thu May 26 04:35:56 CEST 2011


Revision: 36902
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36902
Author:   jwilkins
Date:     2011-05-26 02:35:55 +0000 (Thu, 26 May 2011)
Log Message:
-----------
Merged with trunk: 33704-34399

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/macros.cmake
    branches/soc-2010-jwilkins/build_files/scons/config/win64-vc-config.py
    branches/soc-2010-jwilkins/doc/manpage/blender.1
    branches/soc-2010-jwilkins/doc/python_api/sphinx_doc_gen.py
    branches/soc-2010-jwilkins/extern/binreloc/CMakeLists.txt
    branches/soc-2010-jwilkins/extern/bullet2/CMakeLists.txt
    branches/soc-2010-jwilkins/extern/glew/CMakeLists.txt
    branches/soc-2010-jwilkins/extern/libopenjpeg/CMakeLists.txt
    branches/soc-2010-jwilkins/extern/libredcode/CMakeLists.txt
    branches/soc-2010-jwilkins/extern/lzma/CMakeLists.txt
    branches/soc-2010-jwilkins/extern/lzo/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/audaspace/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
    branches/soc-2010-jwilkins/intern/audaspace/Python/AUD_PyAPI.cpp
    branches/soc-2010-jwilkins/intern/audaspace/intern/AUD_SequencerReader.cpp
    branches/soc-2010-jwilkins/intern/audaspace/jack/AUD_JackDevice.cpp
    branches/soc-2010-jwilkins/intern/audaspace/jack/AUD_JackDevice.h
    branches/soc-2010-jwilkins/intern/boolop/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/bsp/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/container/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/decimation/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/elbeem/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/ghost/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/ghost/GHOST_C-api.h
    branches/soc-2010-jwilkins/intern/ghost/GHOST_ISystem.h
    branches/soc-2010-jwilkins/intern/ghost/GHOST_Path-api.h
    branches/soc-2010-jwilkins/intern/ghost/GHOST_Types.h
    branches/soc-2010-jwilkins/intern/ghost/SConscript
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_Path-api.cpp
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_System.h
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemCarbon.h
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemWin32.h
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemX11.h
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2010-jwilkins/intern/ghost/intern/Makefile
    branches/soc-2010-jwilkins/intern/guardedalloc/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2010-jwilkins/intern/iksolver/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/itasc/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/memutil/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/moto/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/opennl/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/smoke/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/string/CMakeLists.txt
    branches/soc-2010-jwilkins/release/VERSION
    branches/soc-2010-jwilkins/release/datafiles/prvicons
    branches/soc-2010-jwilkins/release/datafiles/splash.png
    branches/soc-2010-jwilkins/release/freedesktop/icons/16x16/blender.png
    branches/soc-2010-jwilkins/release/freedesktop/icons/22x22/blender.png
    branches/soc-2010-jwilkins/release/freedesktop/icons/32x32/blender.png
    branches/soc-2010-jwilkins/release/freedesktop/icons/32x32/blender.svg
    branches/soc-2010-jwilkins/release/getversion.py
    branches/soc-2010-jwilkins/release/plugins/sequence/color-correction-hsv.c
    branches/soc-2010-jwilkins/release/plugins/sequence/color-correction-yuv.c
    branches/soc-2010-jwilkins/release/scripts/io/netrender/__init__.py
    branches/soc-2010-jwilkins/release/scripts/io/netrender/balancing.py
    branches/soc-2010-jwilkins/release/scripts/io/netrender/client.py
    branches/soc-2010-jwilkins/release/scripts/io/netrender/master.py
    branches/soc-2010-jwilkins/release/scripts/io/netrender/master_html.py
    branches/soc-2010-jwilkins/release/scripts/io/netrender/model.py
    branches/soc-2010-jwilkins/release/scripts/io/netrender/netrender.js
    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/keyingsets/keyingsets_utils.py
    branches/soc-2010-jwilkins/release/scripts/modules/add_object_utils.py
    branches/soc-2010-jwilkins/release/scripts/modules/animsys_refactor.py
    branches/soc-2010-jwilkins/release/scripts/modules/bpy/ops.py
    branches/soc-2010-jwilkins/release/scripts/modules/bpy/path.py
    branches/soc-2010-jwilkins/release/scripts/modules/bpy/utils.py
    branches/soc-2010-jwilkins/release/scripts/modules/rna_prop_ui.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/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/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/wm.py
    branches/soc-2010-jwilkins/release/scripts/presets/keyconfig/maya.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/apple.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/chicken.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/cream.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/ketchup.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/marble.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/potato.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/skim_milk.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/skin1.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/skin2.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/whole_milk.py
    branches/soc-2010-jwilkins/release/scripts/templates/background_job.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_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_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_common.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_dopesheet.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_nla.py
    branches/soc-2010-jwilkins/release/scripts/ui/space_sequencer.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/release/test/pep8.py
    branches/soc-2010-jwilkins/release/text/readme.html
    branches/soc-2010-jwilkins/release/windows/installer/00.sconsblender.nsi
    branches/soc-2010-jwilkins/source/blender/avi/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/blenfont/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/blenfont/intern/blf.c
    branches/soc-2010-jwilkins/source/blender/blenfont/intern/blf_font.c
    branches/soc-2010-jwilkins/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_action.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_animsys.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_blender.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_bmesh.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_brush.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_deform.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_depsgraph.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_exotic.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_global.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_image.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_key.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_library.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_main.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_material.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_multires.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_pointcache.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_sca.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_scene.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_shrinkwrap.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_sound.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_text.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_utildefines.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/blenkernel/SConscript
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/BME_conversions.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/BME_eulers.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/BME_structure.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/BME_tools.c
    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/boids.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/bvhutils.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/cloth.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/collision.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/colortools.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/customdata_file.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/fluidsim.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/font.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/gpencil.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/group.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/icons.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/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/paint.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/particle.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/report.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/scene.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/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/text.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/texture.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_ghash.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_listbase.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_base.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_color.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_geom.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_inline.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_matrix.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_storage_types.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_dynstr.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/BLI_kdopbvh.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/listbase.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_base_inline.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_color.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_geom.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_geom_inline.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/scanfill.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/storage.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/voxel.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/winstuff.c
    branches/soc-2010-jwilkins/source/blender/blenloader/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/blenloader/SConscript
    branches/soc-2010-jwilkins/source/blender/blenloader/intern/readblenentry.c
    branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-jwilkins/source/blender/blenloader/intern/writefile.c
    branches/soc-2010-jwilkins/source/blender/blenpluginapi/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2010-jwilkins/source/blender/collada/ArmatureImporter.h
    branches/soc-2010-jwilkins/source/blender/collada/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/collada/DocumentImporter.cpp
    branches/soc-2010-jwilkins/source/blender/collada/MeshImporter.cpp
    branches/soc-2010-jwilkins/source/blender/collada/SkinInfo.cpp
    branches/soc-2010-jwilkins/source/blender/editors/animation/CMakeLists.txt
    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_deps.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/CMakeLists.txt
    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_generate.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/poseSlide.c
    branches/soc-2010-jwilkins/source/blender/editors/armature/poseUtils.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/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/curve/curve_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/curve/editcurve.c
    branches/soc-2010-jwilkins/source/blender/editors/curve/editfont.c
    branches/soc-2010-jwilkins/source/blender/editors/datafiles/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/datafiles/splash.png.c
    branches/soc-2010-jwilkins/source/blender/editors/datafiles/startup.blend.c
    branches/soc-2010-jwilkins/source/blender/editors/gpencil/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/gpencil/drawgpencil.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_paint.c
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_anim_api.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_curve.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_fileselect.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_gpencil.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_keyframes_draw.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_particle.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_render.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_sculpt.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_transform.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_util.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/include/UI_resources.h
    branches/soc-2010-jwilkins/source/blender/editors/interface/CMakeLists.txt
    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/CMakeLists.txt
    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/loopcut.c
    branches/soc-2010-jwilkins/source/blender/editors/mesh/mesh_data.c
    branches/soc-2010-jwilkins/source/blender/editors/mesh/mesh_intern.h
    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/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/metaball/mball_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/object/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/object/object_add.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_bake.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_constraint.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_group.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_hook.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/object/object_lattice.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_modifier.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_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_shapekey.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_transform.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_vgroup.c
    branches/soc-2010-jwilkins/source/blender/editors/physics/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/physics/particle_boids.c
    branches/soc-2010-jwilkins/source/blender/editors/physics/particle_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/physics/particle_object.c
    branches/soc-2010-jwilkins/source/blender/editors/physics/physics_fluid.c
    branches/soc-2010-jwilkins/source/blender/editors/physics/physics_pointcache.c
    branches/soc-2010-jwilkins/source/blender/editors/render/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/render/render_internal.c
    branches/soc-2010-jwilkins/source/blender/editors/render/render_opengl.c
    branches/soc-2010-jwilkins/source/blender/editors/render/render_preview.c
    branches/soc-2010-jwilkins/source/blender/editors/render/render_shading.c
    branches/soc-2010-jwilkins/source/blender/editors/screen/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/screen/area.c
    branches/soc-2010-jwilkins/source/blender/editors/screen/glutil.c
    branches/soc-2010-jwilkins/source/blender/editors/screen/screen_context.c
    branches/soc-2010-jwilkins/source/blender/editors/screen/screen_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/screen/screen_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/screen/screendump.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_undo.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/soc-2010-jwilkins/source/blender/editors/sound/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/sound/sound_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_action/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_action/SConscript
    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_select.c
    branches/soc-2010-jwilkins/source/blender/editors/space_action/space_action.c
    branches/soc-2010-jwilkins/source/blender/editors/space_api/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_api/spacetypes.c
    branches/soc-2010-jwilkins/source/blender/editors/space_buttons/CMakeLists.txt
    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_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_console/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_console/console_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_console/console_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_console/space_console.c
    branches/soc-2010-jwilkins/source/blender/editors/space_file/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_file/file_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_file/file_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_file/file_panels.c
    branches/soc-2010-jwilkins/source/blender/editors/space_file/filelist.c
    branches/soc-2010-jwilkins/source/blender/editors/space_file/filelist.h
    branches/soc-2010-jwilkins/source/blender/editors/space_file/filesel.c
    branches/soc-2010-jwilkins/source/blender/editors/space_file/space_file.c
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_select.c
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/space_graph.c
    branches/soc-2010-jwilkins/source/blender/editors/space_image/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_image/image_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_image/image_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_image/image_header.c
    branches/soc-2010-jwilkins/source/blender/editors/space_image/image_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_image/image_render.c
    branches/soc-2010-jwilkins/source/blender/editors/space_image/space_image.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_info/info_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/info_stats.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/space_info.c
    branches/soc-2010-jwilkins/source/blender/editors/space_logic/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_window.c
    branches/soc-2010-jwilkins/source/blender/editors/space_logic/space_logic.c
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_channels.c
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/space_nla.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_node/drawnode.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_header.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_select.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_state.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/space_node.c
    branches/soc-2010-jwilkins/source/blender/editors/space_outliner/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_outliner/outliner.c
    branches/soc-2010-jwilkins/source/blender/editors/space_outliner/outliner_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_outliner/outliner_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2010-jwilkins/source/blender/editors/space_script/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_script/script_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_script/script_header.c
    branches/soc-2010-jwilkins/source/blender/editors/space_script/space_script.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_scopes.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sound/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_sound/sound_header.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_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_time/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_time/space_time.c
    branches/soc-2010-jwilkins/source/blender/editors/space_time/time_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_userpref/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_userpref/space_userpref.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawanimviz.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawvolume.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2010-jwilkins/source/blender/editors/transform/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/transform/transform.c
    branches/soc-2010-jwilkins/source/blender/editors/transform/transform.h
    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_ndofinput.c
    branches/soc-2010-jwilkins/source/blender/editors/transform/transform_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/transform/transform_orientations.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/editmode_undo.c
    branches/soc-2010-jwilkins/source/blender/editors/util/numinput.c
    branches/soc-2010-jwilkins/source/blender/editors/util/undo.c
    branches/soc-2010-jwilkins/source/blender/editors/util/util_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_intern.h
    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/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_material.c
    branches/soc-2010-jwilkins/source/blender/ikplugin/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/ikplugin/intern/ikplugin_api.c
    branches/soc-2010-jwilkins/source/blender/ikplugin/intern/iksolver_plugin.c
    branches/soc-2010-jwilkins/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/soc-2010-jwilkins/source/blender/imbuf/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/IMB_anim.h
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/cache.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/cineon/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/cineon/cineon_dpx.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/dds/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/divers.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/filter.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/openexr/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/openexr/openexr_api.h
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/rectop.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/rotate.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/thumbs_blend.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/tiff.c
    branches/soc-2010-jwilkins/source/blender/makesdna/CMakeLists.txt
    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_anim_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_boid_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_camera_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_fileglobal_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_group_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_lattice_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_mesh_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_modifier_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_sequence_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_space_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_text_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_world_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/intern/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2010-jwilkins/source/blender/makesrna/RNA_access.h
    branches/soc-2010-jwilkins/source/blender/makesrna/RNA_define.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/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/makesrna.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_access.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_action.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.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_lamp.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_lattice.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_meta.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_object_force.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_property.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_sequencer_api.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_space.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_text.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_ui_api.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_wm_api.c
    branches/soc-2010-jwilkins/source/blender/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_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_uvproject.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2010-jwilkins/source/blender/nodes/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_util.h
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_util.h
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_util.h
    branches/soc-2010-jwilkins/source/blender/python/BPY_extern.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/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/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/generic/py_capi_utils.c
    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_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_wrap.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_props.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_rna.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_rna_array.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_rna_callback.c
    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/intern/stubs.c
    branches/soc-2010-jwilkins/source/blender/quicktime/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/readblenfile/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/readblenfile/SConscript
    branches/soc-2010-jwilkins/source/blender/render/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2010-jwilkins/source/blender/render/extern/include/RE_raytrace.h
    branches/soc-2010-jwilkins/source/blender/render/extern/include/RE_shader_ext.h
    branches/soc-2010-jwilkins/source/blender/render/intern/include/render_types.h
    branches/soc-2010-jwilkins/source/blender/render/intern/include/strand.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_rtbuild.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/envmap.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/imagetexture.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/initrender.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/occlusion.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/pipeline.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/pixelshading.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/pointdensity.c
    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/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/shadbuf.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/sss.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/strand.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/texture.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/render/intern/source/voxeldata.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/zbuf.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_dragdrop.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_draw.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_gesture.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_subwindow.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2010-jwilkins/source/blenderplayer/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2010-jwilkins/source/creator/CMakeLists.txt
    branches/soc-2010-jwilkins/source/creator/buildinfo.c
    branches/soc-2010-jwilkins/source/creator/creator.c
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/KX_BlenderGL.h
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/soc-2010-jwilkins/source/gameengine/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ArmatureObject.cpp
    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_ShapeActionActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/soc-2010-jwilkins/source/gameengine/Converter/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/Expressions/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/common/GPC_RenderTools.h
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/common/Makefile
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/common/SConscript
    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/GamePlayer/xembed/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_IpoActuator.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/Makefile
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/SConscript
    branches/soc-2010-jwilkins/source/gameengine/Network/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/Physics/Dummy/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/Physics/common/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2010-jwilkins/source/gameengine/SceneGraph/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/VideoTexture/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/VideoTexture/FilterBlueScreen.cpp
    branches/soc-2010-jwilkins/source/gameengine/VideoTexture/FilterColor.cpp
    branches/soc-2010-jwilkins/source/gameengine/VideoTexture/ImageBase.cpp
    branches/soc-2010-jwilkins/source/gameengine/VideoTexture/ImageRender.cpp
    branches/soc-2010-jwilkins/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/soc-2010-jwilkins/source/gameengine/VideoTexture/PyTypeList.cpp
    branches/soc-2010-jwilkins/source/gameengine/VideoTexture/PyTypeList.h
    branches/soc-2010-jwilkins/source/gameengine/VideoTexture/VideoBase.cpp
    branches/soc-2010-jwilkins/source/kernel/CMakeLists.txt

Added Paths:
-----------
    branches/soc-2010-jwilkins/build_files/cmake/cmake_qtcreator_project.py
    branches/soc-2010-jwilkins/build_files/cmake/example_scripts/make_quiet.sh
    branches/soc-2010-jwilkins/intern/ghost/GHOST_ISystemPaths.h
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_ISystemPaths.cpp
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemPaths.h
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemPathsCarbon.cpp
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemPathsCarbon.h
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemPathsCocoa.h
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemPathsCocoa.mm
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemPathsWin32.h
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemPathsX11.cpp
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemPathsX11.h
    branches/soc-2010-jwilkins/intern/tools/bpy_introspect_ui.py
    branches/soc-2010-jwilkins/intern/tools/dump_rna2xml.py
    branches/soc-2010-jwilkins/release/freedesktop/icons/128x128/
    branches/soc-2010-jwilkins/release/freedesktop/icons/128x128/blender.png
    branches/soc-2010-jwilkins/release/freedesktop/icons/128x128/blender.svg
    branches/soc-2010-jwilkins/release/freedesktop/icons/16x16/blender.svg
    branches/soc-2010-jwilkins/release/freedesktop/icons/192x192/
    branches/soc-2010-jwilkins/release/freedesktop/icons/192x192/blender.png
    branches/soc-2010-jwilkins/release/freedesktop/icons/192x192/blender.svg
    branches/soc-2010-jwilkins/release/freedesktop/icons/22x22/blender.svg
    branches/soc-2010-jwilkins/release/freedesktop/icons/48x48/
    branches/soc-2010-jwilkins/release/freedesktop/icons/48x48/blender.png
    branches/soc-2010-jwilkins/release/freedesktop/icons/48x48/blender.svg
    branches/soc-2010-jwilkins/release/freedesktop/icons/64x64/
    branches/soc-2010-jwilkins/release/freedesktop/icons/64x64/blender.png
    branches/soc-2010-jwilkins/release/freedesktop/icons/64x64/blender.svg
    branches/soc-2010-jwilkins/release/freedesktop/icons/96x96/
    branches/soc-2010-jwilkins/release/freedesktop/icons/96x96/blender.png
    branches/soc-2010-jwilkins/release/freedesktop/icons/96x96/blender.svg
    branches/soc-2010-jwilkins/release/scripts/io/netrender/thumbnail.py
    branches/soc-2010-jwilkins/release/scripts/modules/image_utils.py
    branches/soc-2010-jwilkins/release/scripts/templates/addon_add_object.py
    branches/soc-2010-jwilkins/release/scripts/templates/builtin_keyingset.py
    branches/soc-2010-jwilkins/release/scripts/templates/operator_mesh_add.py
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_array_mallocn.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_FontObject.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_FontObject.h

Removed Paths:
-------------
    branches/soc-2010-jwilkins/doc/python_api/epy/Geometry.py
    branches/soc-2010-jwilkins/doc/python_api/epy/Mathutils.py
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CMakeLists.txt
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/CMakeLists.txt
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
    branches/soc-2010-jwilkins/extern/bullet2/src/CMakeLists.txt
    branches/soc-2010-jwilkins/extern/bullet2/src/LinearMath/CMakeLists.txt
    branches/soc-2010-jwilkins/release/freedesktop/icons/128x128/blender.png
    branches/soc-2010-jwilkins/release/freedesktop/icons/128x128/blender.svg
    branches/soc-2010-jwilkins/release/freedesktop/icons/16x16/blender.xcf.bz2
    branches/soc-2010-jwilkins/release/freedesktop/icons/192x192/blender.png
    branches/soc-2010-jwilkins/release/freedesktop/icons/192x192/blender.svg
    branches/soc-2010-jwilkins/release/freedesktop/icons/22x22/blender.xcf.bz2
    branches/soc-2010-jwilkins/release/freedesktop/icons/48x48/blender.png
    branches/soc-2010-jwilkins/release/freedesktop/icons/48x48/blender.svg
    branches/soc-2010-jwilkins/release/freedesktop/icons/64x64/blender.png
    branches/soc-2010-jwilkins/release/freedesktop/icons/64x64/blender.svg
    branches/soc-2010-jwilkins/release/freedesktop/icons/96x96/blender.png
    branches/soc-2010-jwilkins/release/freedesktop/icons/96x96/blender.svg
    branches/soc-2010-jwilkins/release/scripts/op/io_anim_bvh/__init__.py
    branches/soc-2010-jwilkins/release/scripts/op/io_anim_bvh/import_bvh.py
    branches/soc-2010-jwilkins/release/scripts/op/io_mesh_ply/__init__.py
    branches/soc-2010-jwilkins/release/scripts/op/io_mesh_ply/export_ply.py
    branches/soc-2010-jwilkins/release/scripts/op/io_scene_3ds/__init__.py
    branches/soc-2010-jwilkins/release/scripts/op/io_scene_3ds/export_3ds.py
    branches/soc-2010-jwilkins/release/scripts/op/io_scene_3ds/import_3ds.py
    branches/soc-2010-jwilkins/release/scripts/op/io_scene_fbx/__init__.py
    branches/soc-2010-jwilkins/release/scripts/op/io_scene_fbx/export_fbx.py
    branches/soc-2010-jwilkins/release/scripts/op/io_scene_obj/__init__.py
    branches/soc-2010-jwilkins/release/scripts/op/io_scene_obj/export_obj.py
    branches/soc-2010-jwilkins/release/scripts/op/io_scene_obj/import_obj.py
    branches/soc-2010-jwilkins/release/scripts/op/io_scene_x3d/__init__.py
    branches/soc-2010-jwilkins/release/scripts/op/io_scene_x3d/export_x3d.py
    branches/soc-2010-jwilkins/release/scripts/op/io_shape_mdd/__init__.py
    branches/soc-2010-jwilkins/release/scripts/op/io_shape_mdd/export_mdd.py
    branches/soc-2010-jwilkins/release/scripts/op/io_shape_mdd/import_mdd.py
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_retopo.h

Property Changed:
----------------
    branches/soc-2010-jwilkins/
    branches/soc-2010-jwilkins/doc/python_api/alternative/epy/__init__.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/__init__.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/_ast_util.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ast.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/cache.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/codegen.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/exceptions.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/__init__.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/autohandler.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/babelplugin.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/preprocessors.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/pygmentplugin.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/ext/turbogears.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/filters.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/lexer.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/lookup.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/parsetree.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/pygen.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/pyparser.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/runtime.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/template.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/mako/util.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/__init__.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/_constants.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/_native.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/_speedups.py
    branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/_speedups.so
    branches/soc-2010-jwilkins/doc/python_api/alternative/markupsafe/tests.py


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

Modified: branches/soc-2010-jwilkins/CMakeLists.txt
===================================================================
--- branches/soc-2010-jwilkins/CMakeLists.txt	2011-05-26 02:25:05 UTC (rev 36901)
+++ branches/soc-2010-jwilkins/CMakeLists.txt	2011-05-26 02:35:55 UTC (rev 36902)
@@ -1,3 +1,4 @@
+# -*- mode: cmake; indent-tabs-mode: t; -*-
 # $Id$
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -129,7 +130,7 @@
 option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
 mark_as_advanced(WITH_CXX_GUARDEDALLOC)
 
-option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BKE_assert()" OFF)
+option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
 mark_as_advanced(WITH_ASSERT_ABORT)
 
 if(APPLE)
@@ -361,13 +362,6 @@
 		ADD_DEFINITIONS(-DWITH_ONSURFACEBRUSH)
 	ENDIF(WITH_ONSURFACEBRUSH)
 
-	SET(PLATFORM_LINKFLAGS "-pthread")
-
-	# Better warnings
-	# note: -Wunused-parameter should be added but for now only apply to ./source/blender
-		set(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas")
-		set(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
-
 	# Intel C++ Compiler
 	elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 		# think these next two are broken
@@ -386,13 +380,8 @@
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fp-model precise -prec_div -parallel")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fp-model precise -prec_div -parallel")
 
+		# set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -diag-enable sc3")
 		set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
-
-		# set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -diag-enable sc3")
-
-		set(C_WARNINGS "-Wall -Wpointer-arith -Wno-unknown-pragmas")
-		set(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
-
 		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-intel")
 	endif()
 
@@ -616,10 +605,6 @@
 			set(LLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
 			set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
 
-		# Better warnings
-			set(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas")
-			set(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
-
 			set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE")
 			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE")
 		endif()
@@ -715,7 +700,7 @@
 	endif()
 
 	# used in many places so include globally, like OpenGL
-	include_directories(${PTHREADS_INC})
+	blender_include_dirs("${PTHREADS_INC}")
 
 elseif(APPLE)
 
@@ -907,11 +892,6 @@
 		set(CMAKE_C_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
 		set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
 	endif()
-
-	# Better warnings
-	set(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas")
-	set(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
-
 endif()
 
 
@@ -919,18 +899,18 @@
 if(WITH_BUILDINFO)
 	# BUILD_PLATFORM and BUILD_PLATFORM are taken from CMake
 	if(UNIX)
-		EXEC_PROGRAM("date \"+%Y-%m-%d\"" OUTPUT_VARIABLE BUILD_DATE)
-		EXEC_PROGRAM("date \"+%H:%M:%S\"" OUTPUT_VARIABLE BUILD_TIME)  
-		EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV RETURN_VALUE BUILD_REV_RETURN)
+		execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+		execute_process(COMMAND date "+%H:%M:%S" OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)  
+		execute_process(COMMAND svnversion ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE BUILD_REV RESULT_VARIABLE BUILD_REV_RETURN OUTPUT_STRIP_TRAILING_WHITESPACE)
 		if(BUILD_REV_RETURN)
 			set(BUILD_REV "unknown")
 		endif()
 	endif()
 	
 	if(WIN32)
-		EXEC_PROGRAM("cmd /c date /t" OUTPUT_VARIABLE BUILD_DATE)
-		EXEC_PROGRAM("cmd /c time /t" OUTPUT_VARIABLE BUILD_TIME)  
-		EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV RETURN_VALUE BUILD_REV_RETURN)
+		execute_process(COMMAND cmd /c date /t OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+		execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)  
+		execute_process(COMMAND svnversion ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE BUILD_REV RESULT_VARIABLE BUILD_REV_RETURN OUTPUT_STRIP_TRAILING_WHITESPACE)
 		if(BUILD_REV_RETURN)
 			set(BUILD_REV "unknown")
 		endif()
@@ -979,7 +959,7 @@
 #-----------------------------------------------------------------------------
 # Configure OpenGL.
 find_package(OpenGL)
-include_directories(${OPENGL_INCLUDE_DIR})
+blender_include_dirs("${OPENGL_INCLUDE_DIR}")
 # unset(OPENGL_LIBRARIES CACHE) # not compat with older cmake 
 # unset(OPENGL_xmesa_INCLUDE_DIR CACHE) # not compat with older cmake 
 
@@ -997,6 +977,9 @@
 	else()
 		set(WITH_OPENMP OFF)
 	endif()
+
+	mark_as_advanced(OpenMP_C_FLAGS)
+	mark_as_advanced(OpenMP_CXX_FLAGS)
 endif() 
 
 #-----------------------------------------------------------------------------
@@ -1018,9 +1001,36 @@
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCC)
-	set(C_WARNINGS "${C_WARNINGS} -Wunused-parameter -Wwrite-strings -Werror=strict-prototypes -Werror=declaration-after-statement -Werror=implicit-function-declaration -Werror=return-type")
+
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_CAST_ALIGN -Wcast-align)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_DECLARATION_AFTER_STATEMENT -Werror=declaration-after-statement)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_RETURN_TYPE -Werror=return-type)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_STRICT_PROTOTYPES -Werror=strict-prototypes)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_WRITE_STRINGS -Wwrite-strings)
+
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof)
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare)
+
+elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
+
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas)
+
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof)
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare)
+
 endif()
 
+
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS} ${C_WARNINGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS} ${CXX_WARNINGS}")
 
@@ -1033,6 +1043,9 @@
 	add_definitions(-DWITH_ASSERT_ABORT)
 endif()
 
+# message(STATUS "Using CFLAGS: ${CMAKE_C_FLAGS}")
+# message(STATUS "Using CXXFLAGS: ${CMAKE_CXX_FLAGS}")
+
 #-----------------------------------------------------------------------------
 # Libraries
 

Modified: branches/soc-2010-jwilkins/SConstruct
===================================================================
--- branches/soc-2010-jwilkins/SConstruct	2011-05-26 02:25:05 UTC (rev 36901)
+++ branches/soc-2010-jwilkins/SConstruct	2011-05-26 02:35:55 UTC (rev 36902)
@@ -70,7 +70,7 @@
 
 ##### BEGIN SETUP #####
 
-B.possible_types = ['core', 'player', 'intern', 'extern']
+B.possible_types = ['core', 'player', 'player2', 'intern', 'extern']
 
 B.binarykind = ['blender' , 'blenderplayer']
 ##################################
@@ -395,7 +395,7 @@
 # libraries to give as objects to linking phase
 mainlist = []
 for tp in B.possible_types:
-	if not tp == 'player':
+    if (not tp == 'player') and (not tp == 'player2'):
 		mainlist += B.create_blender_liblist(env, tp)
 
 if B.arguments.get('BF_PRIORITYLIST', '0')=='1':
@@ -409,9 +409,10 @@
     env.BlenderProg(B.root_build_dir, "blender", mainlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
 if env['WITH_BF_PLAYER']:
 	playerlist = B.create_blender_liblist(env, 'player')
+    playerlist += B.create_blender_liblist(env, 'player2')
 	playerlist += B.create_blender_liblist(env, 'intern')
 	playerlist += B.create_blender_liblist(env, 'extern')
-    env.BlenderProg(B.root_build_dir, "blenderplayer",  playerlist, thestatlibs + dobj + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
+    env.BlenderProg(B.root_build_dir, "blenderplayer",  playerlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
 
 ##### Now define some targets
 

Modified: branches/soc-2010-jwilkins/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/soc-2010-jwilkins/build_files/cmake/cmake_consistency_check.py	2011-05-26 02:25:05 UTC (rev 36901)
+++ branches/soc-2010-jwilkins/build_files/cmake/cmake_consistency_check.py	2011-05-26 02:35:55 UTC (rev 36902)
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 # $Id$
 # ***** BEGIN GPL LICENSE BLOCK *****
 #

Copied: branches/soc-2010-jwilkins/build_files/cmake/cmake_qtcreator_project.py (from rev 34339, trunk/blender/build_files/cmake/cmake_qtcreator_project.py)
===================================================================
--- branches/soc-2010-jwilkins/build_files/cmake/cmake_qtcreator_project.py	                        (rev 0)
+++ branches/soc-2010-jwilkins/build_files/cmake/cmake_qtcreator_project.py	2011-05-26 02:35:55 UTC (rev 36902)
@@ -0,0 +1,94 @@
+#!/usr/bin/env python
+
+# $Id:

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list