[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31350] branches/particles-2010: svn merge -r30017:31346 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

[Lukas Toenne]

Revision: 31350
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31350
Author:   lukastoenne
Date:     2010-08-15 15:53:11 +0200 (Sun, 15 Aug 2010)

Log Message:
-----------
svn merge -r30017:31346 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/particles-2010/CMakeLists.txt
    branches/particles-2010/Makefile
    branches/particles-2010/SConstruct
    branches/particles-2010/doc/blender.1
    branches/particles-2010/doc/blender.1.py
    branches/particles-2010/extern/CMakeLists.txt
    branches/particles-2010/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
    branches/particles-2010/extern/glew/include/GL/glew.h
    branches/particles-2010/extern/glew/src/glew.c
    branches/particles-2010/extern/libopenjpeg/dwt.c
    branches/particles-2010/intern/CMakeLists.txt
    branches/particles-2010/intern/audaspace/intern/AUD_IReader.h
    branches/particles-2010/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
    branches/particles-2010/intern/ghost/CMakeLists.txt
    branches/particles-2010/intern/ghost/SConscript
    branches/particles-2010/intern/ghost/intern/GHOST_EventDragnDrop.h
    branches/particles-2010/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/particles-2010/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/particles-2010/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/particles-2010/intern/ghost/intern/GHOST_SystemWin32.h
    branches/particles-2010/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/particles-2010/intern/ghost/intern/GHOST_WindowCarbon.cpp
    branches/particles-2010/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/particles-2010/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/particles-2010/intern/ghost/make/msvc_9_0/ghost.vcproj
    branches/particles-2010/intern/guardedalloc/MEM_guardedalloc.h
    branches/particles-2010/intern/iksolver/intern/TNT/vec.h
    branches/particles-2010/intern/itasc/MovingFrame.cpp
    branches/particles-2010/intern/smoke/extern/smoke_API.h
    branches/particles-2010/intern/smoke/intern/FLUID_3D.cpp
    branches/particles-2010/intern/smoke/intern/FLUID_3D.h
    branches/particles-2010/intern/smoke/intern/smoke_API.cpp
    branches/particles-2010/intern/string/intern/STR_String.cpp
    branches/particles-2010/po/Makefile
    branches/particles-2010/projectfiles_vc9/blender/blender.vcproj
    branches/particles-2010/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
    branches/particles-2010/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/particles-2010/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
    branches/particles-2010/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
    branches/particles-2010/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/particles-2010/release/Makefile
    branches/particles-2010/release/VERSION
    branches/particles-2010/release/datafiles/splash.png
    branches/particles-2010/release/freedesktop/blender.desktop
    branches/particles-2010/release/plugins/Makefile
    branches/particles-2010/release/plugins/bmake
    branches/particles-2010/release/plugins/sequence/Makefile
    branches/particles-2010/release/plugins/texture/Makefile
    branches/particles-2010/release/scripts/io/export_3ds.py
    branches/particles-2010/release/scripts/io/export_fbx.py
    branches/particles-2010/release/scripts/io/export_mdd.py
    branches/particles-2010/release/scripts/io/export_obj.py
    branches/particles-2010/release/scripts/io/export_ply.py
    branches/particles-2010/release/scripts/io/export_x3d.py
    branches/particles-2010/release/scripts/io/import_anim_bvh.py
    branches/particles-2010/release/scripts/io/import_scene_3ds.py
    branches/particles-2010/release/scripts/io/import_scene_obj.py
    branches/particles-2010/release/scripts/io/import_shape_mdd.py
    branches/particles-2010/release/scripts/io/netrender/__init__.py
    branches/particles-2010/release/scripts/io/netrender/client.py
    branches/particles-2010/release/scripts/io/netrender/master.py
    branches/particles-2010/release/scripts/io/netrender/master_html.py
    branches/particles-2010/release/scripts/io/netrender/operators.py
    branches/particles-2010/release/scripts/io/netrender/repath.py
    branches/particles-2010/release/scripts/io/netrender/slave.py
    branches/particles-2010/release/scripts/io/netrender/ui.py
    branches/particles-2010/release/scripts/io/netrender/utils.py
    branches/particles-2010/release/scripts/modules/add_object_utils.py
    branches/particles-2010/release/scripts/modules/bpy/__init__.py
    branches/particles-2010/release/scripts/modules/bpy/utils.py
    branches/particles-2010/release/scripts/modules/bpy_types.py
    branches/particles-2010/release/scripts/modules/console/complete_calltip.py
    branches/particles-2010/release/scripts/modules/rigify/__init__.py
    branches/particles-2010/release/scripts/modules/rigify/arm_biped.py
    branches/particles-2010/release/scripts/modules/rigify/spine_pivot_flex.py
    branches/particles-2010/release/scripts/modules/rigify/tail_control.py
    branches/particles-2010/release/scripts/modules/rna_info.py
    branches/particles-2010/release/scripts/modules/rna_prop_ui.py
    branches/particles-2010/release/scripts/op/add_armature_human.py
    branches/particles-2010/release/scripts/op/add_mesh_torus.py
    branches/particles-2010/release/scripts/op/console_python.py
    branches/particles-2010/release/scripts/op/console_shell.py
    branches/particles-2010/release/scripts/op/fcurve_euler_filter.py
    branches/particles-2010/release/scripts/op/image.py
    branches/particles-2010/release/scripts/op/mesh.py
    branches/particles-2010/release/scripts/op/nla.py
    branches/particles-2010/release/scripts/op/object.py
    branches/particles-2010/release/scripts/op/object_align.py
    branches/particles-2010/release/scripts/op/object_randomize_transform.py
    branches/particles-2010/release/scripts/op/presets.py
    branches/particles-2010/release/scripts/op/screen_play_rendered_anim.py
    branches/particles-2010/release/scripts/op/sequencer.py
    branches/particles-2010/release/scripts/op/uv.py
    branches/particles-2010/release/scripts/op/uvcalc_follow_active.py
    branches/particles-2010/release/scripts/op/uvcalc_smart_project.py
    branches/particles-2010/release/scripts/op/vertexpaint_dirt.py
    branches/particles-2010/release/scripts/op/wm.py
    branches/particles-2010/release/scripts/presets/cloth/cotton.py
    branches/particles-2010/release/scripts/presets/cloth/denim.py
    branches/particles-2010/release/scripts/presets/cloth/leather.py
    branches/particles-2010/release/scripts/presets/cloth/rubber.py
    branches/particles-2010/release/scripts/presets/cloth/silk.py
    branches/particles-2010/release/scripts/presets/ffmpeg/DV.py
    branches/particles-2010/release/scripts/presets/ffmpeg/DVD.py
    branches/particles-2010/release/scripts/presets/ffmpeg/SVCD.py
    branches/particles-2010/release/scripts/presets/ffmpeg/VCD.py
    branches/particles-2010/release/scripts/presets/ffmpeg/h264.py
    branches/particles-2010/release/scripts/presets/ffmpeg/theora.py
    branches/particles-2010/release/scripts/presets/ffmpeg/xvid.py
    branches/particles-2010/release/scripts/presets/interaction/maya.py
    branches/particles-2010/release/scripts/presets/render/DVCPRO_HD_1080p.py
    branches/particles-2010/release/scripts/presets/render/DVCPRO_HD_720p.py
    branches/particles-2010/release/scripts/presets/render/HDTV_1080p.py
    branches/particles-2010/release/scripts/presets/render/HDTV_720p.py
    branches/particles-2010/release/scripts/presets/render/HDV_1080p.py
    branches/particles-2010/release/scripts/presets/render/TV_NTSC_16_colon_9.py
    branches/particles-2010/release/scripts/presets/render/TV_NTSC_4_colon_3.py
    branches/particles-2010/release/scripts/presets/render/TV_PAL_16_colon_9.py
    branches/particles-2010/release/scripts/presets/render/TV_PAL_4_colon_3.py
    branches/particles-2010/release/scripts/presets/sss/apple.py
    branches/particles-2010/release/scripts/presets/sss/chicken.py
    branches/particles-2010/release/scripts/presets/sss/cream.py
    branches/particles-2010/release/scripts/presets/sss/ketchup.py
    branches/particles-2010/release/scripts/presets/sss/marble.py
    branches/particles-2010/release/scripts/presets/sss/potato.py
    branches/particles-2010/release/scripts/presets/sss/skim_milk.py
    branches/particles-2010/release/scripts/presets/sss/skin1.py
    branches/particles-2010/release/scripts/presets/sss/skin2.py
    branches/particles-2010/release/scripts/presets/sss/whole_milk.py
    branches/particles-2010/release/scripts/presets/sunsky/classic.py
    branches/particles-2010/release/scripts/presets/sunsky/desert.py
    branches/particles-2010/release/scripts/presets/sunsky/mountain.py
    branches/particles-2010/release/scripts/templates/gamelogic.py
    branches/particles-2010/release/scripts/templates/operator.py
    branches/particles-2010/release/scripts/templates/operator_modal.py
    branches/particles-2010/release/scripts/templates/operator_modal_draw.py
    branches/particles-2010/release/scripts/templates/operator_modal_view3d.py
    branches/particles-2010/release/scripts/templates/operator_simple.py
    branches/particles-2010/release/scripts/templates/operator_uv.py
    branches/particles-2010/release/scripts/templates/panel_simple.py
    branches/particles-2010/release/scripts/ui/properties_animviz.py
    branches/particles-2010/release/scripts/ui/properties_data_armature.py
    branches/particles-2010/release/scripts/ui/properties_data_armature_rigify.py
    branches/particles-2010/release/scripts/ui/properties_data_bone.py
    branches/particles-2010/release/scripts/ui/properties_data_camera.py
    branches/particles-2010/release/scripts/ui/properties_data_curve.py
    branches/particles-2010/release/scripts/ui/properties_data_empty.py
    branches/particles-2010/release/scripts/ui/properties_data_lamp.py
    branches/particles-2010/release/scripts/ui/properties_data_lattice.py
    branches/particles-2010/release/scripts/ui/properties_data_mesh.py
    branches/particles-2010/release/scripts/ui/properties_data_metaball.py
    branches/particles-2010/release/scripts/ui/properties_data_modifier.py
    branches/particles-2010/release/scripts/ui/properties_game.py
    branches/particles-2010/release/scripts/ui/properties_material.py
    branches/particles-2010/release/scripts/ui/properties_object.py
    branches/particles-2010/release/scripts/ui/properties_object_constraint.py
    branches/particles-2010/release/scripts/ui/properties_particle.py
    branches/particles-2010/release/scripts/ui/properties_physics_cloth.py
    branches/particles-2010/release/scripts/ui/properties_physics_common.py
    branches/particles-2010/release/scripts/ui/properties_physics_field.py
    branches/particles-2010/release/scripts/ui/properties_physics_fluid.py
    branches/particles-2010/release/scripts/ui/properties_physics_smoke.py
    branches/particles-2010/release/scripts/ui/properties_physics_softbody.py
    branches/particles-2010/release/scripts/ui/properties_render.py
    branches/particles-2010/release/scripts/ui/properties_scene.py
    branches/particles-2010/release/scripts/ui/properties_texture.py
    branches/particles-2010/release/scripts/ui/properties_world.py
    branches/particles-2010/release/scripts/ui/space_console.py
    branches/particles-2010/release/scripts/ui/space_dopesheet.py
    branches/particles-2010/release/scripts/ui/space_filebrowser.py
    branches/particles-2010/release/scripts/ui/space_graph.py
    branches/particles-2010/release/scripts/ui/space_image.py
    branches/particles-2010/release/scripts/ui/space_info.py
    branches/particles-2010/release/scripts/ui/space_logic.py
    branches/particles-2010/release/scripts/ui/space_nla.py
    branches/particles-2010/release/scripts/ui/space_node.py
    branches/particles-2010/release/scripts/ui/space_outliner.py
    branches/particles-2010/release/scripts/ui/space_sequencer.py
    branches/particles-2010/release/scripts/ui/space_text.py
    branches/particles-2010/release/scripts/ui/space_time.py
    branches/particles-2010/release/scripts/ui/space_userpref.py
    branches/particles-2010/release/scripts/ui/space_userpref_keymap.py
    branches/particles-2010/release/scripts/ui/space_view3d.py
    branches/particles-2010/release/scripts/ui/space_view3d_toolbar.py
    branches/particles-2010/release/text/copyright.txt
    branches/particles-2010/release/text/readme.html
    branches/particles-2010/release/windows/installer/00.sconsblender.nsi
    branches/particles-2010/source/Makefile
    branches/particles-2010/source/blender/CMakeLists.txt
    branches/particles-2010/source/blender/Makefile
    branches/particles-2010/source/blender/SConscript
    branches/particles-2010/source/blender/avi/AVI_avi.h
    branches/particles-2010/source/blender/avi/CMakeLists.txt
    branches/particles-2010/source/blender/avi/Makefile
    branches/particles-2010/source/blender/avi/intern/Makefile
    branches/particles-2010/source/blender/blenfont/Makefile
    branches/particles-2010/source/blender/blenfont/intern/Makefile
    branches/particles-2010/source/blender/blenfont/intern/blf_font.c
    branches/particles-2010/source/blender/blenkernel/BKE_anim.h
    branches/particles-2010/source/blender/blenkernel/BKE_armature.h
    branches/particles-2010/source/blender/blenkernel/BKE_blender.h
    branches/particles-2010/source/blender/blenkernel/BKE_bmesh.h
    branches/particles-2010/source/blender/blenkernel/BKE_brush.h
    branches/particles-2010/source/blender/blenkernel/BKE_cloth.h
    branches/particles-2010/source/blender/blenkernel/BKE_collision.h
    branches/particles-2010/source/blender/blenkernel/BKE_colortools.h
    branches/particles-2010/source/blender/blenkernel/BKE_curve.h
    branches/particles-2010/source/blender/blenkernel/BKE_depsgraph.h
    branches/particles-2010/source/blender/blenkernel/BKE_displist.h
    branches/particles-2010/source/blender/blenkernel/BKE_effect.h
    branches/particles-2010/source/blender/blenkernel/BKE_fcurve.h
    branches/particles-2010/source/blender/blenkernel/BKE_image.h
    branches/particles-2010/source/blender/blenkernel/BKE_library.h
    branches/particles-2010/source/blender/blenkernel/BKE_main.h
    branches/particles-2010/source/blender/blenkernel/BKE_material.h
    branches/particles-2010/source/blender/blenkernel/BKE_mball.h
    branches/particles-2010/source/blender/blenkernel/BKE_mesh.h
    branches/particles-2010/source/blender/blenkernel/BKE_node.h
    branches/particles-2010/source/blender/blenkernel/BKE_object.h
    branches/particles-2010/source/blender/blenkernel/BKE_paint.h
    branches/particles-2010/source/blender/blenkernel/BKE_particle.h
    branches/particles-2010/source/blender/blenkernel/BKE_pointcache.h
    branches/particles-2010/source/blender/blenkernel/BKE_sca.h
    branches/particles-2010/source/blender/blenkernel/BKE_scene.h
    branches/particles-2010/source/blender/blenkernel/BKE_sequencer.h
    branches/particles-2010/source/blender/blenkernel/BKE_sound.h
    branches/particles-2010/source/blender/blenkernel/BKE_text.h
    branches/particles-2010/source/blender/blenkernel/BKE_texture.h
    branches/particles-2010/source/blender/blenkernel/CMakeLists.txt
    branches/particles-2010/source/blender/blenkernel/Makefile
    branches/particles-2010/source/blender/blenkernel/SConscript
    branches/particles-2010/source/blender/blenkernel/intern/BME_conversions.c
    branches/particles-2010/source/blender/blenkernel/intern/DerivedMesh.c
    branches/particles-2010/source/blender/blenkernel/intern/Makefile
    branches/particles-2010/source/blender/blenkernel/intern/action.c
    branches/particles-2010/source/blender/blenkernel/intern/anim.c
    branches/particles-2010/source/blender/blenkernel/intern/armature.c
    branches/particles-2010/source/blender/blenkernel/intern/blender.c
    branches/particles-2010/source/blender/blenkernel/intern/brush.c
    branches/particles-2010/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/particles-2010/source/blender/blenkernel/intern/cloth.c
    branches/particles-2010/source/blender/blenkernel/intern/collision.c
    branches/particles-2010/source/blender/blenkernel/intern/colortools.c
    branches/particles-2010/source/blender/blenkernel/intern/constraint.c
    branches/particles-2010/source/blender/blenkernel/intern/curve.c
    branches/particles-2010/source/blender/blenkernel/intern/depsgraph.c
    branches/particles-2010/source/blender/blenkernel/intern/displist.c
    branches/particles-2010/source/blender/blenkernel/intern/effect.c
    branches/particles-2010/source/blender/blenkernel/intern/fmodifier.c
    branches/particles-2010/source/blender/blenkernel/intern/font.c
    branches/particles-2010/source/blender/blenkernel/intern/group.c
    branches/particles-2010/source/blender/blenkernel/intern/icons.c
    branches/particles-2010/source/blender/blenkernel/intern/idprop.c
    branches/particles-2010/source/blender/blenkernel/intern/image.c
    branches/particles-2010/source/blender/blenkernel/intern/implicit.c
    branches/particles-2010/source/blender/blenkernel/intern/ipo.c
    branches/particles-2010/source/blender/blenkernel/intern/key.c
    branches/particles-2010/source/blender/blenkernel/intern/lattice.c
    branches/particles-2010/source/blender/blenkernel/intern/library.c
    branches/particles-2010/source/blender/blenkernel/intern/material.c
    branches/particles-2010/source/blender/blenkernel/intern/mball.c
    branches/particles-2010/source/blender/blenkernel/intern/mesh.c
    branches/particles-2010/source/blender/blenkernel/intern/modifier.c
    branches/particles-2010/source/blender/blenkernel/intern/nla.c
    branches/particles-2010/source/blender/blenkernel/intern/node.c
    branches/particles-2010/source/blender/blenkernel/intern/object.c
    branches/particles-2010/source/blender/blenkernel/intern/paint.c
    branches/particles-2010/source/blender/blenkernel/intern/particle.c
    branches/particles-2010/source/blender/blenkernel/intern/particle_system.c
    branches/particles-2010/source/blender/blenkernel/intern/pointcache.c
    branches/particles-2010/source/blender/blenkernel/intern/sca.c
    branches/particles-2010/source/blender/blenkernel/intern/scene.c
    branches/particles-2010/source/blender/blenkernel/intern/seqeffects.c
    branches/particles-2010/source/blender/blenkernel/intern/sequencer.c
    branches/particles-2010/source/blender/blenkernel/intern/smoke.c
    branches/particles-2010/source/blender/blenkernel/intern/softbody.c
    branches/particles-2010/source/blender/blenkernel/intern/sound.c
    branches/particles-2010/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/particles-2010/source/blender/blenkernel/intern/text.c
    branches/particles-2010/source/blender/blenkernel/intern/texture.c
    branches/particles-2010/source/blender/blenkernel/intern/world.c
    branches/particles-2010/source/blender/blenlib/BLI_ghash.h
    branches/particles-2010/source/blender/blenlib/BLI_listbase.h
    branches/particles-2010/source/blender/blenlib/BLI_math_rotation.h
    branches/particles-2010/source/blender/blenlib/BLI_math_vector.h
    branches/particles-2010/source/blender/blenlib/BLI_path_util.h
    branches/particles-2010/source/blender/blenlib/BLI_pbvh.h
    branches/particles-2010/source/blender/blenlib/BLI_storage_types.h
    branches/particles-2010/source/blender/blenlib/BLI_winstuff.h
    branches/particles-2010/source/blender/blenlib/CMakeLists.txt
    branches/particles-2010/source/blender/blenlib/Makefile
    branches/particles-2010/source/blender/blenlib/intern/Makefile
    branches/particles-2010/source/blender/blenlib/intern/bpath.c
    branches/particles-2010/source/blender/blenlib/intern/fileops.c
    branches/particles-2010/source/blender/blenlib/intern/listbase.c
    branches/particles-2010/source/blender/blenlib/intern/math_color.c
    branches/particles-2010/source/blender/blenlib/intern/math_geom.c
    branches/particles-2010/source/blender/blenlib/intern/math_geom_inline.c
    branches/particles-2010/source/blender/blenlib/intern/math_matrix.c
    branches/particles-2010/source/blender/blenlib/intern/math_rotation.c
    branches/particles-2010/source/blender/blenlib/intern/math_vector_inline.c
    branches/particles-2010/source/blender/blenlib/intern/path_util.c
    branches/particles-2010/source/blender/blenlib/intern/pbvh.c
    branches/particles-2010/source/blender/blenlib/intern/scanfill.c
    branches/particles-2010/source/blender/blenlib/intern/storage.c
    branches/particles-2010/source/blender/blenloader/BLO_readfile.h
    branches/particles-2010/source/blender/blenloader/Makefile
    branches/particles-2010/source/blender/blenloader/intern/Makefile
    branches/particles-2010/source/blender/blenloader/intern/readblenentry.c
    branches/particles-2010/source/blender/blenloader/intern/readfile.c
    branches/particles-2010/source/blender/blenloader/intern/undofile.c
    branches/particles-2010/source/blender/blenloader/intern/writefile.c
    branches/particles-2010/source/blender/blenpluginapi/CMakeLists.txt
    branches/particles-2010/source/blender/blenpluginapi/Makefile
    branches/particles-2010/source/blender/blenpluginapi/intern/Makefile
    branches/particles-2010/source/blender/collada/DocumentExporter.cpp
    branches/particles-2010/source/blender/collada/DocumentImporter.cpp
    branches/particles-2010/source/blender/collada/Makefile
    branches/particles-2010/source/blender/collada/SConscript
    branches/particles-2010/source/blender/editors/Makefile
    branches/particles-2010/source/blender/editors/animation/Makefile
    branches/particles-2010/source/blender/editors/animation/anim_channels_edit.c
    branches/particles-2010/source/blender/editors/animation/anim_filter.c
    branches/particles-2010/source/blender/editors/animation/anim_markers.c
    branches/particles-2010/source/blender/editors/animation/anim_ops.c
    branches/particles-2010/source/blender/editors/animation/drivers.c
    branches/particles-2010/source/blender/editors/animation/fmodifier_ui.c
    branches/particles-2010/source/blender/editors/animation/keyframes_draw.c
    branches/particles-2010/source/blender/editors/animation/keyframes_edit.c
    branches/particles-2010/source/blender/editors/animation/keyframes_general.c
    branches/particles-2010/source/blender/editors/animation/keyframing.c
    branches/particles-2010/source/blender/editors/animation/keyingsets.c
    branches/particles-2010/source/blender/editors/armature/Makefile
    branches/particles-2010/source/blender/editors/armature/armature_intern.h
    branches/particles-2010/source/blender/editors/armature/armature_ops.c
    branches/particles-2010/source/blender/editors/armature/editarmature.c
    branches/particles-2010/source/blender/editors/armature/editarmature_generate.c
    branches/particles-2010/source/blender/editors/armature/editarmature_retarget.c
    branches/particles-2010/source/blender/editors/armature/editarmature_sketch.c
    branches/particles-2010/source/blender/editors/armature/meshlaplacian.c
    branches/particles-2010/source/blender/editors/armature/poseSlide.c
    branches/particles-2010/source/blender/editors/armature/poseUtils.c
    branches/particles-2010/source/blender/editors/armature/poselib.c
    branches/particles-2010/source/blender/editors/armature/poseobject.c
    branches/particles-2010/source/blender/editors/armature/reeb.c
    branches/particles-2010/source/blender/editors/curve/Makefile
    branches/particles-2010/source/blender/editors/curve/curve_ops.c
    branches/particles-2010/source/blender/editors/curve/editcurve.c
    branches/particles-2010/source/blender/editors/curve/editfont.c
    branches/particles-2010/source/blender/editors/datafiles/Makefile
    branches/particles-2010/source/blender/editors/datafiles/SConscript
    branches/particles-2010/source/blender/editors/datafiles/splash.png.c
    branches/particles-2010/source/blender/editors/gpencil/Makefile
    branches/particles-2010/source/blender/editors/gpencil/drawgpencil.c
    branches/particles-2010/source/blender/editors/gpencil/editaction_gpencil.c
    branches/particles-2010/source/blender/editors/gpencil/gpencil_buttons.c
    branches/particles-2010/source/blender/editors/gpencil/gpencil_edit.c
    branches/particles-2010/source/blender/editors/gpencil/gpencil_paint.c
    branches/particles-2010/source/blender/editors/include/ED_armature.h
    branches/particles-2010/source/blender/editors/include/ED_curve.h
    branches/particles-2010/source/blender/editors/include/ED_datafiles.h
    branches/particles-2010/source/blender/editors/include/ED_object.h
    branches/particles-2010/source/blender/editors/include/ED_sculpt.h
    branches/particles-2010/source/blender/editors/include/ED_view3d.h
    branches/particles-2010/source/blender/editors/include/UI_icons.h
    branches/particles-2010/source/blender/editors/interface/Makefile
    branches/particles-2010/source/blender/editors/interface/interface.c
    branches/particles-2010/source/blender/editors/interface/interface_anim.c
    branches/particles-2010/source/blender/editors/interface/interface_draw.c
    branches/particles-2010/source/blender/editors/interface/interface_handlers.c
    branches/particles-2010/source/blender/editors/interface/interface_icons.c
    branches/particles-2010/source/blender/editors/interface/interface_layout.c
    branches/particles-2010/source/blender/editors/interface/interface_ops.c
    branches/particles-2010/source/blender/editors/interface/interface_panel.c
    branches/particles-2010/source/blender/editors/interface/interface_regions.c
    branches/particles-2010/source/blender/editors/interface/interface_style.c
    branches/particles-2010/source/blender/editors/interface/interface_templates.c
    branches/particles-2010/source/blender/editors/interface/interface_widgets.c
    branches/particles-2010/source/blender/editors/interface/resources.c
    branches/particles-2010/source/blender/editors/interface/view2d_ops.c
    branches/particles-2010/source/blender/editors/mesh/Makefile
    branches/particles-2010/source/blender/editors/mesh/editface.c
    branches/particles-2010/source/blender/editors/mesh/editmesh.c
    branches/particles-2010/source/blender/editors/mesh/editmesh_add.c
    branches/particles-2010/source/blender/editors/mesh/editmesh_loop.c
    branches/particles-2010/source/blender/editors/mesh/editmesh_mods.c
    branches/particles-2010/source/blender/editors/mesh/editmesh_tools.c
    branches/particles-2010/source/blender/editors/mesh/loopcut.c
    branches/particles-2010/source/blender/editors/mesh/mesh_data.c
    branches/particles-2010/source/blender/editors/mesh/mesh_intern.h
    branches/particles-2010/source/blender/editors/mesh/mesh_ops.c
    branches/particles-2010/source/blender/editors/mesh/meshtools.c
    branches/particles-2010/source/blender/editors/metaball/Makefile
    branches/particles-2010/source/blender/editors/metaball/mball_edit.c
    branches/particles-2010/source/blender/editors/metaball/mball_ops.c
    branches/particles-2010/source/blender/editors/object/Makefile
    branches/particles-2010/source/blender/editors/object/object_add.c
    branches/particles-2010/source/blender/editors/object/object_bake.c
    branches/particles-2010/source/blender/editors/object/object_constraint.c
    branches/particles-2010/source/blender/editors/object/object_edit.c
    branches/particles-2010/source/blender/editors/object/object_group.c
    branches/particles-2010/source/blender/editors/object/object_hook.c
    branches/particles-2010/source/blender/editors/object/object_intern.h
    branches/particles-2010/source/blender/editors/object/object_lattice.c
    branches/particles-2010/source/blender/editors/object/object_modifier.c
    branches/particles-2010/source/blender/editors/object/object_ops.c
    branches/particles-2010/source/blender/editors/object/object_relations.c
    branches/particles-2010/source/blender/editors/object/object_select.c
    branches/particles-2010/source/blender/editors/object/object_shapekey.c
    branches/particles-2010/source/blender/editors/object/object_transform.c
    branches/particles-2010/source/blender/editors/object/object_vgroup.c
    branches/particles-2010/source/blender/editors/physics/CMakeLists.txt
    branches/particles-2010/source/blender/editors/physics/Makefile
    branches/particles-2010/source/blender/editors/physics/particle_boids.c
    branches/particles-2010/source/blender/editors/physics/particle_edit.c
    branches/particles-2010/source/blender/editors/physics/particle_object.c
    branches/particles-2010/source/blender/editors/physics/physics_fluid.c
    branches/particles-2010/source/blender/editors/physics/physics_ops.c
    branches/particles-2010/source/blender/editors/physics/physics_pointcache.c
    branches/particles-2010/source/blender/editors/render/Makefile
    branches/particles-2010/source/blender/editors/render/render_internal.c
    branches/particles-2010/source/blender/editors/render/render_opengl.c
    branches/particles-2010/source/blender/editors/render/render_preview.c
    branches/particles-2010/source/blender/editors/render/render_shading.c
    branches/particles-2010/source/blender/editors/screen/Makefile
    branches/particles-2010/source/blender/editors/screen/area.c
    branches/particles-2010/source/blender/editors/screen/screen_context.c
    branches/particles-2010/source/blender/editors/screen/screen_edit.c
    branches/particles-2010/source/blender/editors/screen/screen_intern.h
    branches/particles-2010/source/blender/editors/screen/screen_ops.c
    branches/particles-2010/source/blender/editors/screen/screendump.c
    branches/particles-2010/source/blender/editors/sculpt_paint/Makefile
    branches/particles-2010/source/blender/editors/sculpt_paint/SConscript
    branches/particles-2010/source/blender/editors/sculpt_paint/paint_image.c
    branches/particles-2010/source/blender/editors/sculpt_paint/paint_intern.h
    branches/particles-2010/source/blender/editors/sculpt_paint/paint_ops.c
    branches/particles-2010/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/particles-2010/source/blender/editors/sculpt_paint/paint_undo.c
    branches/particles-2010/source/blender/editors/sculpt_paint/paint_utils.c
    branches/particles-2010/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/particles-2010/source/blender/editors/sculpt_paint/sculpt.c
    branches/particles-2010/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/particles-2010/source/blender/editors/sound/Makefile
    branches/particles-2010/source/blender/editors/sound/sound_ops.c
    branches/particles-2010/source/blender/editors/space_action/Makefile
    branches/particles-2010/source/blender/editors/space_action/action_draw.c
    branches/particles-2010/source/blender/editors/space_action/action_edit.c
    branches/particles-2010/source/blender/editors/space_action/action_ops.c
    branches/particles-2010/source/blender/editors/space_action/action_select.c
    branches/particles-2010/source/blender/editors/space_action/space_action.c
    branches/particles-2010/source/blender/editors/space_api/Makefile
    branches/particles-2010/source/blender/editors/space_api/space.c
    branches/particles-2010/source/blender/editors/space_buttons/Makefile
    branches/particles-2010/source/blender/editors/space_buttons/buttons_context.c
    branches/particles-2010/source/blender/editors/space_buttons/buttons_header.c
    branches/particles-2010/source/blender/editors/space_buttons/buttons_ops.c
    branches/particles-2010/source/blender/editors/space_buttons/space_buttons.c
    branches/particles-2010/source/blender/editors/space_console/Makefile
    branches/particles-2010/source/blender/editors/space_console/console_draw.c
    branches/particles-2010/source/blender/editors/space_console/console_ops.c
    branches/particles-2010/source/blender/editors/space_console/console_report.c
    branches/particles-2010/source/blender/editors/space_console/space_console.c
    branches/particles-2010/source/blender/editors/space_file/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_file/Makefile
    branches/particles-2010/source/blender/editors/space_file/file_draw.c
    branches/particles-2010/source/blender/editors/space_file/file_ops.c
    branches/particles-2010/source/blender/editors/space_file/filelist.c
    branches/particles-2010/source/blender/editors/space_file/filesel.c
    branches/particles-2010/source/blender/editors/space_file/fsmenu.c
    branches/particles-2010/source/blender/editors/space_file/space_file.c
    branches/particles-2010/source/blender/editors/space_file/writeimage.c
    branches/particles-2010/source/blender/editors/space_graph/Makefile
    branches/particles-2010/source/blender/editors/space_graph/graph_buttons.c
    branches/particles-2010/source/blender/editors/space_graph/graph_draw.c
    branches/particles-2010/source/blender/editors/space_graph/graph_edit.c
    branches/particles-2010/source/blender/editors/space_graph/graph_ops.c
    branches/particles-2010/source/blender/editors/space_graph/graph_select.c
    branches/particles-2010/source/blender/editors/space_graph/graph_utils.c
    branches/particles-2010/source/blender/editors/space_graph/space_graph.c
    branches/particles-2010/source/blender/editors/space_image/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_image/Makefile
    branches/particles-2010/source/blender/editors/space_image/image_buttons.c
    branches/particles-2010/source/blender/editors/space_image/image_draw.c
    branches/particles-2010/source/blender/editors/space_image/image_header.c
    branches/particles-2010/source/blender/editors/space_image/image_ops.c
    branches/particles-2010/source/blender/editors/space_image/image_render.c
    branches/particles-2010/source/blender/editors/space_image/space_image.c
    branches/particles-2010/source/blender/editors/space_info/Makefile
    branches/particles-2010/source/blender/editors/space_info/info_ops.c
    branches/particles-2010/source/blender/editors/space_info/info_stats.c
    branches/particles-2010/source/blender/editors/space_info/space_info.c
    branches/particles-2010/source/blender/editors/space_logic/Makefile
    branches/particles-2010/source/blender/editors/space_logic/logic_buttons.c
    branches/particles-2010/source/blender/editors/space_logic/logic_intern.h
    branches/particles-2010/source/blender/editors/space_logic/logic_ops.c
    branches/particles-2010/source/blender/editors/space_logic/logic_window.c
    branches/particles-2010/source/blender/editors/space_logic/space_logic.c
    branches/particles-2010/source/blender/editors/space_nla/Makefile
    branches/particles-2010/source/blender/editors/space_nla/nla_buttons.c
    branches/particles-2010/source/blender/editors/space_nla/nla_channels.c
    branches/particles-2010/source/blender/editors/space_nla/nla_draw.c
    branches/particles-2010/source/blender/editors/space_nla/nla_edit.c
    branches/particles-2010/source/blender/editors/space_nla/nla_ops.c
    branches/particles-2010/source/blender/editors/space_nla/nla_select.c
    branches/particles-2010/source/blender/editors/space_nla/space_nla.c
    branches/particles-2010/source/blender/editors/space_node/Makefile
    branches/particles-2010/source/blender/editors/space_node/drawnode.c
    branches/particles-2010/source/blender/editors/space_node/node_buttons.c
    branches/particles-2010/source/blender/editors/space_node/node_draw.c
    branches/particles-2010/source/blender/editors/space_node/node_edit.c
    branches/particles-2010/source/blender/editors/space_node/node_header.c
    branches/particles-2010/source/blender/editors/space_node/node_ops.c
    branches/particles-2010/source/blender/editors/space_node/node_select.c
    branches/particles-2010/source/blender/editors/space_node/node_state.c
    branches/particles-2010/source/blender/editors/space_node/space_node.c
    branches/particles-2010/source/blender/editors/space_outliner/Makefile
    branches/particles-2010/source/blender/editors/space_outliner/outliner.c
    branches/particles-2010/source/blender/editors/space_outliner/space_outliner.c
    branches/particles-2010/source/blender/editors/space_script/Makefile
    branches/particles-2010/source/blender/editors/space_script/script_edit.c
    branches/particles-2010/source/blender/editors/space_script/script_header.c
    branches/particles-2010/source/blender/editors/space_script/script_ops.c
    branches/particles-2010/source/blender/editors/space_script/space_script.c
    branches/particles-2010/source/blender/editors/space_sequencer/Makefile
    branches/particles-2010/source/blender/editors/space_sequencer/sequencer_add.c
    branches/particles-2010/source/blender/editors/space_sequencer/sequencer_buttons.c
    branches/particles-2010/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/particles-2010/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/particles-2010/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/particles-2010/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/particles-2010/source/blender/editors/space_sequencer/sequencer_select.c
    branches/particles-2010/source/blender/editors/space_sequencer/space_sequencer.c
    branches/particles-2010/source/blender/editors/space_sound/Makefile
    branches/particles-2010/source/blender/editors/space_sound/sound_header.c
    branches/particles-2010/source/blender/editors/space_sound/space_sound.c
    branches/particles-2010/source/blender/editors/space_text/Makefile
    branches/particles-2010/source/blender/editors/space_text/space_text.c
    branches/particles-2010/source/blender/editors/space_text/text_draw.c
    branches/particles-2010/source/blender/editors/space_text/text_header.c
    branches/particles-2010/source/blender/editors/space_text/text_ops.c
    branches/particles-2010/source/blender/editors/space_time/Makefile
    branches/particles-2010/source/blender/editors/space_time/space_time.c
    branches/particles-2010/source/blender/editors/space_time/time_ops.c
    branches/particles-2010/source/blender/editors/space_userpref/Makefile
    branches/particles-2010/source/blender/editors/space_view3d/Makefile
    branches/particles-2010/source/blender/editors/space_view3d/drawanimviz.c
    branches/particles-2010/source/blender/editors/space_view3d/drawarmature.c
    branches/particles-2010/source/blender/editors/space_view3d/drawmesh.c
    branches/particles-2010/source/blender/editors/space_view3d/drawobject.c
    branches/particles-2010/source/blender/editors/space_view3d/drawvolume.c
    branches/particles-2010/source/blender/editors/space_view3d/space_view3d.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_buttons.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_draw.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_edit.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_header.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_intern.h
    branches/particles-2010/source/blender/editors/space_view3d/view3d_ops.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_select.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_snap.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_view.c
    branches/particles-2010/source/blender/editors/transform/Makefile
    branches/particles-2010/source/blender/editors/transform/transform.c
    branches/particles-2010/source/blender/editors/transform/transform_constraints.c
    branches/particles-2010/source/blender/editors/transform/transform_conversions.c
    branches/particles-2010/source/blender/editors/transform/transform_generics.c
    branches/particles-2010/source/blender/editors/transform/transform_input.c
    branches/particles-2010/source/blender/editors/transform/transform_manipulator.c
    branches/particles-2010/source/blender/editors/transform/transform_ops.c
    branches/particles-2010/source/blender/editors/transform/transform_orientations.c
    branches/particles-2010/source/blender/editors/transform/transform_snap.c
    branches/particles-2010/source/blender/editors/util/Makefile
    branches/particles-2010/source/blender/editors/util/ed_util.c
    branches/particles-2010/source/blender/editors/util/editmode_undo.c
    branches/particles-2010/source/blender/editors/util/numinput.c
    branches/particles-2010/source/blender/editors/util/undo.c
    branches/particles-2010/source/blender/editors/uvedit/Makefile
    branches/particles-2010/source/blender/editors/uvedit/uvedit_draw.c
    branches/particles-2010/source/blender/editors/uvedit/uvedit_ops.c
    branches/particles-2010/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/particles-2010/source/blender/gpu/GPU_extensions.h
    branches/particles-2010/source/blender/gpu/GPU_material.h
    branches/particles-2010/source/blender/gpu/Makefile
    branches/particles-2010/source/blender/gpu/intern/Makefile
    branches/particles-2010/source/blender/gpu/intern/gpu_buffers.c
    branches/particles-2010/source/blender/gpu/intern/gpu_codegen.c
    branches/particles-2010/source/blender/gpu/intern/gpu_draw.c
    branches/particles-2010/source/blender/gpu/intern/gpu_extensions.c
    branches/particles-2010/source/blender/gpu/intern/gpu_material.c
    branches/particles-2010/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/particles-2010/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/particles-2010/source/blender/ikplugin/Makefile
    branches/particles-2010/source/blender/ikplugin/intern/Makefile
    branches/particles-2010/source/blender/imbuf/CMakeLists.txt
    branches/particles-2010/source/blender/imbuf/IMB_imbuf.h
    branches/particles-2010/source/blender/imbuf/IMB_imbuf_types.h
    branches/particles-2010/source/blender/imbuf/Makefile
    branches/particles-2010/source/blender/imbuf/SConscript
    branches/particles-2010/source/blender/imbuf/intern/Makefile
    branches/particles-2010/source/blender/imbuf/intern/allocimbuf.c
    branches/particles-2010/source/blender/imbuf/intern/anim.c
    branches/particles-2010/source/blender/imbuf/intern/cineon/CMakeLists.txt
    branches/particles-2010/source/blender/imbuf/intern/cineon/Makefile
    branches/particles-2010/source/blender/imbuf/intern/dds/CMakeLists.txt
    branches/particles-2010/source/blender/imbuf/intern/dds/Makefile
    branches/particles-2010/source/blender/imbuf/intern/divers.c
    branches/particles-2010/source/blender/imbuf/intern/filetype.c
    branches/particles-2010/source/blender/imbuf/intern/imageprocess.c
    branches/particles-2010/source/blender/imbuf/intern/jpeg.c
    branches/particles-2010/source/blender/imbuf/intern/openexr/CMakeLists.txt
    branches/particles-2010/source/blender/imbuf/intern/openexr/Makefile
    branches/particles-2010/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/particles-2010/source/blender/imbuf/intern/png.c
    branches/particles-2010/source/blender/imbuf/intern/radiance_hdr.c
    branches/particles-2010/source/blender/imbuf/intern/thumbs.c
    branches/particles-2010/source/blender/imbuf/intern/thumbs_blend.c
    branches/particles-2010/source/blender/imbuf/intern/tiff.c
    branches/particles-2010/source/blender/imbuf/intern/util.c
    branches/particles-2010/source/blender/makesdna/DNA_ID.h
    branches/particles-2010/source/blender/makesdna/DNA_action_types.h
    branches/particles-2010/source/blender/makesdna/DNA_actuator_types.h
    branches/particles-2010/source/blender/makesdna/DNA_armature_types.h
    branches/particles-2010/source/blender/makesdna/DNA_brush_types.h
    branches/particles-2010/source/blender/makesdna/DNA_color_types.h
    branches/particles-2010/source/blender/makesdna/DNA_constraint_types.h
    branches/particles-2010/source/blender/makesdna/DNA_curve_types.h
    branches/particles-2010/source/blender/makesdna/DNA_image_types.h
    branches/particles-2010/source/blender/makesdna/DNA_lattice_types.h
    branches/particles-2010/source/blender/makesdna/DNA_mesh_types.h
    branches/particles-2010/source/blender/makesdna/DNA_node_types.h
    branches/particles-2010/source/blender/makesdna/DNA_object_types.h
    branches/particles-2010/source/blender/makesdna/DNA_scene_types.h
    branches/particles-2010/source/blender/makesdna/DNA_sdna_types.h
    branches/particles-2010/source/blender/makesdna/DNA_sequence_types.h
    branches/particles-2010/source/blender/makesdna/DNA_smoke_types.h
    branches/particles-2010/source/blender/makesdna/DNA_sound_types.h
    branches/particles-2010/source/blender/makesdna/DNA_space_types.h
    branches/particles-2010/source/blender/makesdna/DNA_texture_types.h
    branches/particles-2010/source/blender/makesdna/DNA_userdef_types.h
    branches/particles-2010/source/blender/makesdna/DNA_windowmanager_types.h
    branches/particles-2010/source/blender/makesdna/DNA_world_types.h
    branches/particles-2010/source/blender/makesdna/Makefile
    branches/particles-2010/source/blender/makesdna/intern/Makefile
    branches/particles-2010/source/blender/makesdna/intern/dna_genfile.c
    branches/particles-2010/source/blender/makesdna/intern/makesdna.c
    branches/particles-2010/source/blender/makesrna/Makefile
    branches/particles-2010/source/blender/makesrna/RNA_access.h
    branches/particles-2010/source/blender/makesrna/RNA_define.h
    branches/particles-2010/source/blender/makesrna/RNA_enum_types.h
    branches/particles-2010/source/blender/makesrna/SConscript
    branches/particles-2010/source/blender/makesrna/intern/CMakeLists.txt
    branches/particles-2010/source/blender/makesrna/intern/Makefile
    branches/particles-2010/source/blender/makesrna/intern/SConscript
    branches/particles-2010/source/blender/makesrna/intern/makesrna.c
    branches/particles-2010/source/blender/makesrna/intern/rna_access.c
    branches/particles-2010/source/blender/makesrna/intern/rna_action.c
    branches/particles-2010/source/blender/makesrna/intern/rna_actuator.c
    branches/particles-2010/source/blender/makesrna/intern/rna_animation.c
    branches/particles-2010/source/blender/makesrna/intern/rna_animviz.c
    branches/particles-2010/source/blender/makesrna/intern/rna_armature.c
    branches/particles-2010/source/blender/makesrna/intern/rna_boid.c
    branches/particles-2010/source/blender/makesrna/intern/rna_brush.c
    branches/particles-2010/source/blender/makesrna/intern/rna_camera.c
    branches/particles-2010/source/blender/makesrna/intern/rna_cloth.c
    branches/particles-2010/source/blender/makesrna/intern/rna_color.c
    branches/particles-2010/source/blender/makesrna/intern/rna_constraint.c
    branches/particles-2010/source/blender/makesrna/intern/rna_context.c
    branches/particles-2010/source/blender/makesrna/intern/rna_controller.c
    branches/particles-2010/source/blender/makesrna/intern/rna_curve.c
    branches/particles-2010/source/blender/makesrna/intern/rna_define.c
    branches/particles-2010/source/blender/makesrna/intern/rna_fcurve.c
    branches/particles-2010/source/blender/makesrna/intern/rna_fluidsim.c
    branches/particles-2010/source/blender/makesrna/intern/rna_gpencil.c
    branches/particles-2010/source/blender/makesrna/intern/rna_image_api.c
    branches/particles-2010/source/blender/makesrna/intern/rna_internal.h
    branches/particles-2010/source/blender/makesrna/intern/rna_internal_types.h
    branches/particles-2010/source/blender/makesrna/intern/rna_key.c
    branches/particles-2010/source/blender/makesrna/intern/rna_lamp.c
    branches/particles-2010/source/blender/makesrna/intern/rna_lattice.c
    branches/particles-2010/source/blender/makesrna/intern/rna_main.c
    branches/particles-2010/source/blender/makesrna/intern/rna_main_api.c
    branches/particles-2010/source/blender/makesrna/intern/rna_material.c
    branches/particles-2010/source/blender/makesrna/intern/rna_material_api.c
    branches/particles-2010/source/blender/makesrna/intern/rna_mesh.c
    branches/particles-2010/source/blender/makesrna/intern/rna_modifier.c
    branches/particles-2010/source/blender/makesrna/intern/rna_nla.c
    branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
    branches/particles-2010/source/blender/makesrna/intern/rna_object.c
    branches/particles-2010/source/blender/makesrna/intern/rna_object_force.c
    branches/particles-2010/source/blender/makesrna/intern/rna_particle.c
    branches/particles-2010/source/blender/makesrna/intern/rna_pose.c
    branches/particles-2010/source/blender/makesrna/intern/rna_rna.c
    branches/particles-2010/source/blender/makesrna/intern/rna_scene.c
    branches/particles-2010/source/blender/makesrna/intern/rna_scene_api.c
    branches/particles-2010/source/blender/makesrna/intern/rna_screen.c
    branches/particles-2010/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/particles-2010/source/blender/makesrna/intern/rna_sensor.c
    branches/particles-2010/source/blender/makesrna/intern/rna_sequencer.c
    branches/particles-2010/source/blender/makesrna/intern/rna_smoke.c
    branches/particles-2010/source/blender/makesrna/intern/rna_space.c
    branches/particles-2010/source/blender/makesrna/intern/rna_text.c
    branches/particles-2010/source/blender/makesrna/intern/rna_texture.c
    branches/particles-2010/source/blender/makesrna/intern/rna_timeline.c
    branches/particles-2010/source/blender/makesrna/intern/rna_ui.c
    branches/particles-2010/source/blender/makesrna/intern/rna_ui_api.c
    branches/particles-2010/source/blender/makesrna/intern/rna_userdef.c
    branches/particles-2010/source/blender/makesrna/intern/rna_wm.c
    branches/particles-2010/source/blender/makesrna/intern/rna_wm_api.c
    branches/particles-2010/source/blender/makesrna/intern/rna_world.c
    branches/particles-2010/source/blender/makesrna/rna_cleanup/rna_cleaner.py
    branches/particles-2010/source/blender/modifiers/CMakeLists.txt
    branches/particles-2010/source/blender/modifiers/MOD_modifiertypes.h
    branches/particles-2010/source/blender/modifiers/Makefile
    branches/particles-2010/source/blender/modifiers/intern/MOD_armature.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_array.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_boolean.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_cast.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_cloth.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_collision.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_curve.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_displace.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_fluidsim.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_hook.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_lattice.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_mask.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_mirror.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_multires.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_nodetree.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_none.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_screw.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_shrinkwrap.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_smoke.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_solidify.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_util.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_util.h
    branches/particles-2010/source/blender/modifiers/intern/MOD_uvproject.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_wave.c
    branches/particles-2010/source/blender/modifiers/intern/Makefile
    branches/particles-2010/source/blender/nodes/Makefile
    branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
    branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
    branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
    branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
    branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
    branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_value.c
    branches/particles-2010/source/blender/nodes/intern/CMP_nodes/Makefile
    branches/particles-2010/source/blender/nodes/intern/CMP_util.c
    branches/particles-2010/source/blender/nodes/intern/Makefile
    branches/particles-2010/source/blender/nodes/intern/SHD_nodes/Makefile
    branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_value.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/Makefile
    branches/particles-2010/source/blender/nodes/intern/node_util.c
    branches/particles-2010/source/blender/python/Makefile
    branches/particles-2010/source/blender/python/SConscript
    branches/particles-2010/source/blender/python/doc/epy/Geometry.py
    branches/particles-2010/source/blender/python/doc/examples/bpy.data.py
    branches/particles-2010/source/blender/python/doc/examples/mathutils.Vector.py
    branches/particles-2010/source/blender/python/doc/examples/mathutils.py
    branches/particles-2010/source/blender/python/doc/sphinx_doc_gen.py
    branches/particles-2010/source/blender/python/generic/Makefile
    branches/particles-2010/source/blender/python/generic/bgl.c
    branches/particles-2010/source/blender/python/generic/blf_api.c
    branches/particles-2010/source/blender/python/generic/bpy_internal_import.c
    branches/particles-2010/source/blender/python/generic/bpy_internal_import.h
    branches/particles-2010/source/blender/python/generic/geometry.c
    branches/particles-2010/source/blender/python/generic/mathutils.c
    branches/particles-2010/source/blender/python/generic/mathutils.h
    branches/particles-2010/source/blender/python/generic/mathutils_color.c
    branches/particles-2010/source/blender/python/generic/mathutils_euler.c
    branches/particles-2010/source/blender/python/generic/mathutils_matrix.c
    branches/particles-2010/source/blender/python/generic/mathutils_quat.c
    branches/particles-2010/source/blender/python/generic/mathutils_vector.c
    branches/particles-2010/source/blender/python/intern/Makefile
    branches/particles-2010/source/blender/python/intern/bpy.c
    branches/particles-2010/source/blender/python/intern/bpy_app.c
    branches/particles-2010/source/blender/python/intern/bpy_interface.c
    branches/particles-2010/source/blender/python/intern/bpy_operator.c
    branches/particles-2010/source/blender/python/intern/bpy_operator_wrap.c
    branches/particles-2010/source/blender/python/intern/bpy_props.c
    branches/particles-2010/source/blender/python/intern/bpy_rna.c
    branches/particles-2010/source/blender/python/intern/bpy_rna.h
    branches/particles-2010/source/blender/python/intern/bpy_rna_callback.c
    branches/particles-2010/source/blender/python/intern/bpy_util.c
    branches/particles-2010/source/blender/python/intern/bpy_util.h
    branches/particles-2010/source/blender/quicktime/CMakeLists.txt
    branches/particles-2010/source/blender/quicktime/Makefile
    branches/particles-2010/source/blender/quicktime/apple/Makefile
    branches/particles-2010/source/blender/readblenfile/CMakeLists.txt
    branches/particles-2010/source/blender/readblenfile/Makefile
    branches/particles-2010/source/blender/readblenfile/intern/Makefile
    branches/particles-2010/source/blender/readblenfile/stub/Makefile
    branches/particles-2010/source/blender/readblenfile/test/Makefile
    branches/particles-2010/source/blender/render/CMakeLists.txt
    branches/particles-2010/source/blender/render/Makefile
    branches/particles-2010/source/blender/render/SConscript
    branches/particles-2010/source/blender/render/extern/include/RE_pipeline.h
    branches/particles-2010/source/blender/render/intern/Makefile
    branches/particles-2010/source/blender/render/intern/include/render_types.h
    branches/particles-2010/source/blender/render/intern/include/renderdatabase.h
    branches/particles-2010/source/blender/render/intern/include/texture.h
    branches/particles-2010/source/blender/render/intern/include/volume_precache.h
    branches/particles-2010/source/blender/render/intern/raytrace/Makefile
    branches/particles-2010/source/blender/render/intern/raytrace/reorganize.h
    branches/particles-2010/source/blender/render/intern/source/convertblender.c
    branches/particles-2010/source/blender/render/intern/source/envmap.c
    branches/particles-2010/source/blender/render/intern/source/gammaCorrectionTables.c
    branches/particles-2010/source/blender/render/intern/source/occlusion.c
    branches/particles-2010/source/blender/render/intern/source/pipeline.c
    branches/particles-2010/source/blender/render/intern/source/pointdensity.c
    branches/particles-2010/source/blender/render/intern/source/rayshade.c
    branches/particles-2010/source/blender/render/intern/source/renderdatabase.c
    branches/particles-2010/source/blender/render/intern/source/shadeinput.c
    branches/particles-2010/source/blender/render/intern/source/shadeoutput.c
    branches/particles-2010/source/blender/render/intern/source/sss.c
    branches/particles-2010/source/blender/render/intern/source/texture.c
    branches/particles-2010/source/blender/render/intern/source/volume_precache.c
    branches/particles-2010/source/blender/render/intern/source/volumetric.c
    branches/particles-2010/source/blender/render/intern/source/voxeldata.c
    branches/particles-2010/source/blender/verify/Makefile
    branches/particles-2010/source/blender/verify/intern/Makefile
    branches/particles-2010/source/blender/windowmanager/CMakeLists.txt
    branches/particles-2010/source/blender/windowmanager/Makefile
    branches/particles-2010/source/blender/windowmanager/SConscript
    branches/particles-2010/source/blender/windowmanager/WM_api.h
    branches/particles-2010/source/blender/windowmanager/intern/Makefile
    branches/particles-2010/source/blender/windowmanager/intern/wm.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_dragdrop.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_draw.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_event_system.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_files.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_init_exit.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_jobs.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_operators.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_window.c
    branches/particles-2010/source/blenderplayer/CMakeLists.txt
    branches/particles-2010/source/blenderplayer/bad_level_call_stubs/Makefile
    branches/particles-2010/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/particles-2010/source/creator/CMakeLists.txt
    branches/particles-2010/source/creator/Makefile
    branches/particles-2010/source/creator/SConscript
    branches/particles-2010/source/creator/creator.c
    branches/particles-2010/source/darwin/Makefile
    branches/particles-2010/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/particles-2010/source/gameengine/BlenderRoutines/Makefile
    branches/particles-2010/source/gameengine/Converter/BL_ArmatureChannel.cpp
    branches/particles-2010/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/particles-2010/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/particles-2010/source/gameengine/Converter/CMakeLists.txt
    branches/particles-2010/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/particles-2010/source/gameengine/Converter/KX_ConvertControllers.cpp
    branches/particles-2010/source/gameengine/Converter/Makefile
    branches/particles-2010/source/gameengine/Expressions/CMakeLists.txt
    branches/particles-2010/source/gameengine/Expressions/Makefile
    branches/particles-2010/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/particles-2010/source/gameengine/GameLogic/CMakeLists.txt
    branches/particles-2010/source/gameengine/GameLogic/Joystick/Makefile
    branches/particles-2010/source/gameengine/GameLogic/Makefile
    branches/particles-2010/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/particles-2010/source/gameengine/GamePlayer/Makefile
    branches/particles-2010/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/particles-2010/source/gameengine/GamePlayer/common/Makefile
    branches/particles-2010/source/gameengine/GamePlayer/common/unix/Makefile
    branches/particles-2010/source/gameengine/GamePlayer/common/windows/Makefile
    branches/particles-2010/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/particles-2010/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/particles-2010/source/gameengine/GamePlayer/ghost/Makefile
    branches/particles-2010/source/gameengine/GamePlayer/netscape/Makefile
    branches/particles-2010/source/gameengine/GamePlayer/netscape/common/npmac.cpp
    branches/particles-2010/source/gameengine/GamePlayer/netscape/src/Makefile
    branches/particles-2010/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile
    branches/particles-2010/source/gameengine/GamePlayer/netscape/src/xpcom/Makefile
    branches/particles-2010/source/gameengine/GamePlayer/netscape/test/Makefile
    branches/particles-2010/source/gameengine/GamePlayer/netscape/test/colorcycle/Makefile
    branches/particles-2010/source/gameengine/GamePlayer/netscape/test/gears/Makefile
    branches/particles-2010/source/gameengine/GamePlayer/netscape/test/stub/Makefile
    branches/particles-2010/source/gameengine/GamePlayer/netscape/test/threaded_gears/Makefile
    branches/particles-2010/source/gameengine/Ketsji/CMakeLists.txt
    branches/particles-2010/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
    branches/particles-2010/source/gameengine/Ketsji/KXNetwork/Makefile
    branches/particles-2010/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/particles-2010/source/gameengine/Ketsji/KX_Camera.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_Camera.h
    branches/particles-2010/source/gameengine/Ketsji/KX_Dome.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/particles-2010/source/gameengine/Ketsji/KX_Light.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_Scene.cpp
    branches/particles-2010/source/gameengine/Ketsji/Makefile
    branches/particles-2010/source/gameengine/Makefile
    branches/particles-2010/source/gameengine/Network/CMakeLists.txt
    branches/particles-2010/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
    branches/particles-2010/source/gameengine/Network/LoopBackNetwork/Makefile
    branches/particles-2010/source/gameengine/Network/Makefile
    branches/particles-2010/source/gameengine/Network/NG_NetworkScene.cpp
    branches/particles-2010/source/gameengine/Network/TerraplayNetwork/Makefile
    branches/particles-2010/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/particles-2010/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/particles-2010/source/gameengine/Physics/Bullet/Makefile
    branches/particles-2010/source/gameengine/Physics/Dummy/CMakeLists.txt
    branches/particles-2010/source/gameengine/Physics/Dummy/Makefile
    branches/particles-2010/source/gameengine/Physics/Makefile
    branches/particles-2010/source/gameengine/Physics/common/CMakeLists.txt
    branches/particles-2010/source/gameengine/Physics/common/Makefile
    branches/particles-2010/source/gameengine/PyDoc/VideoTexture.py
    branches/particles-2010/source/gameengine/PyDoc/bge.logic.rst
    branches/particles-2010/source/gameengine/PyDoc/bge.render.rst
    branches/particles-2010/source/gameengine/PyDoc/bge.types.rst
    branches/particles-2010/source/gameengine/Rasterizer/CMakeLists.txt
    branches/particles-2010/source/gameengine/Rasterizer/Makefile
    branches/particles-2010/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/particles-2010/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
    branches/particles-2010/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
    branches/particles-2010/source/gameengine/SceneGraph/CMakeLists.txt
    branches/particles-2010/source/gameengine/SceneGraph/Makefile
    branches/particles-2010/source/gameengine/VideoTexture/CMakeLists.txt
    branches/particles-2010/source/gameengine/VideoTexture/Makefile
    branches/particles-2010/source/icons/Makefile
    branches/particles-2010/source/kernel/CMakeLists.txt
    branches/particles-2010/source/kernel/Makefile
    branches/particles-2010/source/kernel/gen_messaging/Makefile
    branches/particles-2010/source/kernel/gen_messaging/intern/Makefile
    branches/particles-2010/source/kernel/gen_system/Makefile
    branches/particles-2010/source/tools/guess/guessconfig

Added Paths:
-----------
    branches/particles-2010/build_files/
    branches/particles-2010/build_files/cmake/
    branches/particles-2010/build_files/cmake/example_scripts/
    branches/particles-2010/build_files/cmake/example_scripts/cmake_linux_install.sh
    branches/particles-2010/build_files/cmake/macros.cmake
    branches/particles-2010/build_files/make/
    branches/particles-2010/build_files/make/dlltool/
    branches/particles-2010/build_files/make/dlltool/Makefile
    branches/particles-2010/build_files/make/dlltool/gettext.def
    branches/particles-2010/build_files/make/dlltool/iconv.def
    branches/particles-2010/build_files/make/dlltool/python.def
    branches/particles-2010/build_files/make/example_scripts/
    branches/particles-2010/build_files/make/example_scripts/linux_nanmakefiles.sh
    branches/particles-2010/build_files/make/example_scripts/macos_nanmakefiles.sh
    branches/particles-2010/build_files/make/example_scripts/sunos_nanmakefiles.sh
    branches/particles-2010/build_files/make/nan_compile.mk
    branches/particles-2010/build_files/make/nan_definitions.mk
    branches/particles-2010/build_files/make/nan_link.mk
    branches/particles-2010/build_files/make/nan_subdirs.mk
    branches/particles-2010/build_files/make/nan_warn.mk
    branches/particles-2010/build_files/scons/
    branches/particles-2010/build_files/scons/config/
    branches/particles-2010/build_files/scons/config/aix4-config.py
    branches/particles-2010/build_files/scons/config/darwin-config.py
    branches/particles-2010/build_files/scons/config/freebsd7-config.py
    branches/particles-2010/build_files/scons/config/freebsd8-config.py
    branches/particles-2010/build_files/scons/config/freebsd9-config.py
    branches/particles-2010/build_files/scons/config/irix6-config.py
    branches/particles-2010/build_files/scons/config/linux2-config.py
    branches/particles-2010/build_files/scons/config/linuxcross-config.py
    branches/particles-2010/build_files/scons/config/openbsd3-config.py
    branches/particles-2010/build_files/scons/config/sunos5-config.py
    branches/particles-2010/build_files/scons/config/win32-mingw-config.py
    branches/particles-2010/build_files/scons/config/win32-vc-config.py
    branches/particles-2010/build_files/scons/config/win64-vc-config.py
    branches/particles-2010/build_files/scons/tools/
    branches/particles-2010/build_files/scons/tools/Blender.py
    branches/particles-2010/build_files/scons/tools/__init__.py
    branches/particles-2010/build_files/scons/tools/bcolors.py
    branches/particles-2010/build_files/scons/tools/btools.py
    branches/particles-2010/build_files/scons/tools/crossmingw.py
    branches/particles-2010/build_files/scons/tools/mstoolkit.py
    branches/particles-2010/release/bin/
    branches/particles-2010/release/bin/.blender/
    branches/particles-2010/release/bin/.blender/.Blanguages
    branches/particles-2010/release/bin/.blender/.bfont.ttf
    branches/particles-2010/release/bin/.blender/locale/
    branches/particles-2010/release/bin/.blender/locale/ar/
    branches/particles-2010/release/bin/.blender/locale/ar/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/bg/
    branches/particles-2010/release/bin/.blender/locale/bg/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/ca/
    branches/particles-2010/release/bin/.blender/locale/ca/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/ca/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/cs/
    branches/particles-2010/release/bin/.blender/locale/cs/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/de/
    branches/particles-2010/release/bin/.blender/locale/de/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/de/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/el/
    branches/particles-2010/release/bin/.blender/locale/el/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/el/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/es/
    branches/particles-2010/release/bin/.blender/locale/es/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/es/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/fi/
    branches/particles-2010/release/bin/.blender/locale/fi/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/fi/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/fr/
    branches/particles-2010/release/bin/.blender/locale/fr/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/hr/
    branches/particles-2010/release/bin/.blender/locale/hr/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/hr/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/hr_HR/
    branches/particles-2010/release/bin/.blender/locale/hr_HR/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/hr_HR/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/it/
    branches/particles-2010/release/bin/.blender/locale/it/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/it/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/ja/
    branches/particles-2010/release/bin/.blender/locale/ja/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/ko/
    branches/particles-2010/release/bin/.blender/locale/ko/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/nl/
    branches/particles-2010/release/bin/.blender/locale/nl/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/nl/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/pl/
    branches/particles-2010/release/bin/.blender/locale/pl/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/pl/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/pt_BR/
    branches/particles-2010/release/bin/.blender/locale/pt_BR/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/ro/
    branches/particles-2010/release/bin/.blender/locale/ro/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/ro/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/ru/
    branches/particles-2010/release/bin/.blender/locale/ru/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/ru/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/sr/
    branches/particles-2010/release/bin/.blender/locale/sr/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/sr at Latn/
    branches/particles-2010/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/sv/
    branches/particles-2010/release/bin/.blender/locale/sv/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/sv/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/uk/
    branches/particles-2010/release/bin/.blender/locale/uk/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/zh_CN/
    branches/particles-2010/release/bin/.blender/locale/zh_CN/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/blender-thumbnailer.py
    branches/particles-2010/release/datafiles/brushicons/
    branches/particles-2010/release/datafiles/brushicons/add.png
    branches/particles-2010/release/datafiles/brushicons/blob.png
    branches/particles-2010/release/datafiles/brushicons/blur.png
    branches/particles-2010/release/datafiles/brushicons/clay.png
    branches/particles-2010/release/datafiles/brushicons/clone.png
    branches/particles-2010/release/datafiles/brushicons/crease.png
    branches/particles-2010/release/datafiles/brushicons/darken.png
    branches/particles-2010/release/datafiles/brushicons/draw.png
    branches/particles-2010/release/datafiles/brushicons/fill.png
    branches/particles-2010/release/datafiles/brushicons/flatten.png
    branches/particles-2010/release/datafiles/brushicons/grab.png
    branches/particles-2010/release/datafiles/brushicons/inflate.png
    branches/particles-2010/release/datafiles/brushicons/layer.png
    branches/particles-2010/release/datafiles/brushicons/lighten.png
    branches/particles-2010/release/datafiles/brushicons/mix.png
    branches/particles-2010/release/datafiles/brushicons/multiply.png
    branches/particles-2010/release/datafiles/brushicons/nudge.png
    branches/particles-2010/release/datafiles/brushicons/pinch.png
    branches/particles-2010/release/datafiles/brushicons/scrape.png
    branches/particles-2010/release/datafiles/brushicons/smear.png
    branches/particles-2010/release/datafiles/brushicons/smooth.png
    branches/particles-2010/release/datafiles/brushicons/snake_hook.png
    branches/particles-2010/release/datafiles/brushicons/soften.png
    branches/particles-2010/release/datafiles/brushicons/subtract.png
    branches/particles-2010/release/datafiles/brushicons/texdraw.png
    branches/particles-2010/release/datafiles/brushicons/thumb.png
    branches/particles-2010/release/datafiles/brushicons/twist.png
    branches/particles-2010/release/datafiles/brushicons/vertexdraw.png
    branches/particles-2010/release/scripts/modules/bpy/path.py
    branches/particles-2010/release/scripts/modules/bpyml.py
    branches/particles-2010/release/scripts/modules/bpyml_ui.py
    branches/particles-2010/release/windows/installer/01.installer.bmp
    branches/particles-2010/source/blender/blenkernel/BKE_idcode.h
    branches/particles-2010/source/blender/blenkernel/intern/idcode.c
    branches/particles-2010/source/blender/blenkernel/intern/seqcache.c
    branches/particles-2010/source/blender/editors/datafiles/add.png.c
    branches/particles-2010/source/blender/editors/datafiles/blob.png.c
    branches/particles-2010/source/blender/editors/datafiles/blur.png.c
    branches/particles-2010/source/blender/editors/datafiles/clay.png.c
    branches/particles-2010/source/blender/editors/datafiles/clone.png.c
    branches/particles-2010/source/blender/editors/datafiles/crease.png.c
    branches/particles-2010/source/blender/editors/datafiles/darken.png.c
    branches/particles-2010/source/blender/editors/datafiles/draw.png.c
    branches/particles-2010/source/blender/editors/datafiles/fill.png.c
    branches/particles-2010/source/blender/editors/datafiles/flatten.png.c
    branches/particles-2010/source/blender/editors/datafiles/grab.png.c
    branches/particles-2010/source/blender/editors/datafiles/inflate.png.c
    branches/particles-2010/source/blender/editors/datafiles/layer.png.c
    branches/particles-2010/source/blender/editors/datafiles/lighten.png.c
    branches/particles-2010/source/blender/editors/datafiles/mix.png.c
    branches/particles-2010/source/blender/editors/datafiles/multiply.png.c
    branches/particles-2010/source/blender/editors/datafiles/nudge.png.c
    branches/particles-2010/source/blender/editors/datafiles/pinch.png.c
    branches/particles-2010/source/blender/editors/datafiles/scrape.png.c
    branches/particles-2010/source/blender/editors/datafiles/smear.png.c
    branches/particles-2010/source/blender/editors/datafiles/smooth.png.c
    branches/particles-2010/source/blender/editors/datafiles/snake_hook.png.c
    branches/particles-2010/source/blender/editors/datafiles/soften.png.c
    branches/particles-2010/source/blender/editors/datafiles/startup.blend.c
    branches/particles-2010/source/blender/editors/datafiles/subtract.png.c
    branches/particles-2010/source/blender/editors/datafiles/texdraw.png.c
    branches/particles-2010/source/blender/editors/datafiles/thumb.png.c
    branches/particles-2010/source/blender/editors/datafiles/twist.png.c
    branches/particles-2010/source/blender/editors/datafiles/vertexdraw.png.c
    branches/particles-2010/source/blender/editors/include/ED_lattice.h
    branches/particles-2010/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/particles-2010/source/blender/gpu/GPU_buffers.h
    branches/particles-2010/source/blender/makesrna/intern/rna_actuator_api.c
    branches/particles-2010/source/blender/makesrna/intern/rna_controller_api.c
    branches/particles-2010/source/blender/makesrna/intern/rna_sensor_api.c
    branches/particles-2010/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
    branches/particles-2010/source/blender/makesrna/rna_cleanup/rna_properties.txt
    branches/particles-2010/source/blender/python/generic/noise.c

Removed Paths:
-------------
    branches/particles-2010/CMake/
    branches/particles-2010/bin/
    branches/particles-2010/build_files/cmake/
    branches/particles-2010/build_files/cmake/example_scripts/
    branches/particles-2010/build_files/cmake/example_scripts/cmake_linux_install.sh
    branches/particles-2010/build_files/cmake/macros.cmake
    branches/particles-2010/build_files/make/
    branches/particles-2010/build_files/make/dlltool/
    branches/particles-2010/build_files/make/dlltool/Makefile
    branches/particles-2010/build_files/make/dlltool/gettext.def
    branches/particles-2010/build_files/make/dlltool/iconv.def
    branches/particles-2010/build_files/make/dlltool/python.def
    branches/particles-2010/build_files/make/example_scripts/
    branches/particles-2010/build_files/make/example_scripts/linux_nanmakefiles.sh
    branches/particles-2010/build_files/make/example_scripts/macos_nanmakefiles.sh
    branches/particles-2010/build_files/make/example_scripts/sunos_nanmakefiles.sh
    branches/particles-2010/build_files/make/nan_compile.mk
    branches/particles-2010/build_files/make/nan_definitions.mk
    branches/particles-2010/build_files/make/nan_link.mk
    branches/particles-2010/build_files/make/nan_subdirs.mk
    branches/particles-2010/build_files/make/nan_warn.mk
    branches/particles-2010/build_files/scons/
    branches/particles-2010/build_files/scons/config/
    branches/particles-2010/build_files/scons/config/aix4-config.py
    branches/particles-2010/build_files/scons/config/darwin-config.py
    branches/particles-2010/build_files/scons/config/freebsd7-config.py
    branches/particles-2010/build_files/scons/config/freebsd8-config.py
    branches/particles-2010/build_files/scons/config/freebsd9-config.py
    branches/particles-2010/build_files/scons/config/irix6-config.py
    branches/particles-2010/build_files/scons/config/linux2-config.py
    branches/particles-2010/build_files/scons/config/linuxcross-config.py
    branches/particles-2010/build_files/scons/config/openbsd3-config.py
    branches/particles-2010/build_files/scons/config/sunos5-config.py
    branches/particles-2010/build_files/scons/config/win32-mingw-config.py
    branches/particles-2010/build_files/scons/config/win32-vc-config.py
    branches/particles-2010/build_files/scons/config/win64-vc-config.py
    branches/particles-2010/build_files/scons/tools/
    branches/particles-2010/build_files/scons/tools/Blender.py
    branches/particles-2010/build_files/scons/tools/__init__.py
    branches/particles-2010/build_files/scons/tools/bcolors.py
    branches/particles-2010/build_files/scons/tools/btools.py
    branches/particles-2010/build_files/scons/tools/crossmingw.py
    branches/particles-2010/build_files/scons/tools/mstoolkit.py
    branches/particles-2010/config/
    branches/particles-2010/dlltool/
    branches/particles-2010/make/
    branches/particles-2010/release/bin/.blender/
    branches/particles-2010/release/bin/.blender/.Blanguages
    branches/particles-2010/release/bin/.blender/.bfont.ttf
    branches/particles-2010/release/bin/.blender/locale/
    branches/particles-2010/release/bin/.blender/locale/ar/
    branches/particles-2010/release/bin/.blender/locale/ar/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/bg/
    branches/particles-2010/release/bin/.blender/locale/bg/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/ca/
    branches/particles-2010/release/bin/.blender/locale/ca/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/ca/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/cs/
    branches/particles-2010/release/bin/.blender/locale/cs/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/de/
    branches/particles-2010/release/bin/.blender/locale/de/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/de/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/el/
    branches/particles-2010/release/bin/.blender/locale/el/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/el/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/es/
    branches/particles-2010/release/bin/.blender/locale/es/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/es/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/fi/
    branches/particles-2010/release/bin/.blender/locale/fi/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/fi/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/fr/
    branches/particles-2010/release/bin/.blender/locale/fr/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/hr/
    branches/particles-2010/release/bin/.blender/locale/hr/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/hr/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/hr_HR/
    branches/particles-2010/release/bin/.blender/locale/hr_HR/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/hr_HR/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/it/
    branches/particles-2010/release/bin/.blender/locale/it/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/it/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/ja/
    branches/particles-2010/release/bin/.blender/locale/ja/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/ko/
    branches/particles-2010/release/bin/.blender/locale/ko/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/nl/
    branches/particles-2010/release/bin/.blender/locale/nl/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/nl/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/pl/
    branches/particles-2010/release/bin/.blender/locale/pl/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/pl/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/pt_BR/
    branches/particles-2010/release/bin/.blender/locale/pt_BR/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/ro/
    branches/particles-2010/release/bin/.blender/locale/ro/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/ro/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/ru/
    branches/particles-2010/release/bin/.blender/locale/ru/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/ru/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/sr/
    branches/particles-2010/release/bin/.blender/locale/sr/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/sr at Latn/
    branches/particles-2010/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/sv/
    branches/particles-2010/release/bin/.blender/locale/sv/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/sv/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/uk/
    branches/particles-2010/release/bin/.blender/locale/uk/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/.blender/locale/zh_CN/
    branches/particles-2010/release/bin/.blender/locale/zh_CN/LC_MESSAGES/
    branches/particles-2010/release/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
    branches/particles-2010/release/bin/blender-thumbnailer.py
    branches/particles-2010/release/datafiles/brushicons/add.png
    branches/particles-2010/release/datafiles/brushicons/blob.png
    branches/particles-2010/release/datafiles/brushicons/blur.png
    branches/particles-2010/release/datafiles/brushicons/clay.png
    branches/particles-2010/release/datafiles/brushicons/clone.png
    branches/particles-2010/release/datafiles/brushicons/crease.png
    branches/particles-2010/release/datafiles/brushicons/darken.png
    branches/particles-2010/release/datafiles/brushicons/draw.png
    branches/particles-2010/release/datafiles/brushicons/fill.png
    branches/particles-2010/release/datafiles/brushicons/flatten.png
    branches/particles-2010/release/datafiles/brushicons/grab.png
    branches/particles-2010/release/datafiles/brushicons/inflate.png
    branches/particles-2010/release/datafiles/brushicons/layer.png
    branches/particles-2010/release/datafiles/brushicons/lighten.png
    branches/particles-2010/release/datafiles/brushicons/mix.png
    branches/particles-2010/release/datafiles/brushicons/multiply.png
    branches/particles-2010/release/datafiles/brushicons/nudge.png
    branches/particles-2010/release/datafiles/brushicons/pinch.png
    branches/particles-2010/release/datafiles/brushicons/scrape.png
    branches/particles-2010/release/datafiles/brushicons/smear.png
    branches/particles-2010/release/datafiles/brushicons/smooth.png
    branches/particles-2010/release/datafiles/brushicons/snake_hook.png
    branches/particles-2010/release/datafiles/brushicons/soften.png
    branches/particles-2010/release/datafiles/brushicons/subtract.png
    branches/particles-2010/release/datafiles/brushicons/texdraw.png
    branches/particles-2010/release/datafiles/brushicons/thumb.png
    branches/particles-2010/release/datafiles/brushicons/twist.png
    branches/particles-2010/release/datafiles/brushicons/vertexdraw.png
    branches/particles-2010/release/scripts/io/engine_render_pov.py
    branches/particles-2010/release/scripts/ui/space_buttons.py
    branches/particles-2010/release/windows/inno/
    branches/particles-2010/source/blender/editors/datafiles/B.blend.c
    branches/particles-2010/source/blender/editors/space_logic/logic_header.c
    branches/particles-2010/source/blender/gpu/gpu_buffers.h
    branches/particles-2010/source/blender/makesdna/DNA_wave_types.h
    branches/particles-2010/source/blender/makesrna/rna_cleanup/rna_booleans.txt
    branches/particles-2010/source/gameengine/PyDoc/SConscript
    branches/particles-2010/source/nan_compile.mk
    branches/particles-2010/source/nan_definitions.mk
    branches/particles-2010/source/nan_link.mk
    branches/particles-2010/source/nan_subdirs.mk
    branches/particles-2010/source/nan_warn.mk
    branches/particles-2010/tools/

Property Changed:
----------------
    branches/particles-2010/release/scripts/io/import_scene_3ds.py
    branches/particles-2010/release/scripts/io/netrender/repath.py
    branches/particles-2010/release/scripts/ui/properties_data_curve.py
    branches/particles-2010/release/scripts/ui/properties_object.py
    branches/particles-2010/release/scripts/ui/properties_object_constraint.py
    branches/particles-2010/release/scripts/ui/properties_physics_cloth.py
    branches/particles-2010/release/scripts/ui/properties_physics_common.py
    branches/particles-2010/release/scripts/ui/properties_physics_softbody.py
    branches/particles-2010/release/scripts/ui/properties_render.py
    branches/particles-2010/release/scripts/ui/properties_scene.py
    branches/particles-2010/release/scripts/ui/space_userpref.py

Modified: branches/particles-2010/CMakeLists.txt
===================================================================
--- branches/particles-2010/CMakeLists.txt	2010-08-15 13:14:52 UTC (rev 31349)
+++ branches/particles-2010/CMakeLists.txt	2010-08-15 13:53:11 UTC (rev 31350)
@@ -55,23 +55,21 @@
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
 SET(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/lib)
 
-# Note! - Could create this from the blender version string
-# ...but thats quite involved, make sure this matches the blender version.
-SET(BLENDER_VERSION  2.5)
-
 #-----------------------------------------------------------------------------
 # Load some macros.
-INCLUDE(CMake/macros.cmake)
+INCLUDE(build_files/cmake/macros.cmake)
 
 #-----------------------------------------------------------------------------
 # Set default config options
 
+GET_BLENDER_VERSION()
+
 # Blender internal features
 OPTION(WITH_INTERNATIONAL "Enable I18N   (International fonts and text)" ON)
 OPTION(WITH_LCMS          "Enable color correction with lcms" OFF)
 OPTION(WITH_PYTHON        "Enable Embedded Python API" ON)
 OPTION(WITH_BUILDINFO     "Include extra build details" ON)
-OPTION(WITH_ELBEEM        "Enable Elbeem (Fluid Simulation)" ON)
+OPTION(WITH_FLUID        "Enable Elbeem (Fluid Simulation)" ON)
 OPTION(WITH_FFTW3         "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
 OPTION(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 OPTION(WITH_GAMEENGINE    "Enable Game Engine" ON)
@@ -84,10 +82,12 @@
 ENDIF()
 
 # Image format support
-OPTION(WITH_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
-OPTION(WITH_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
-OPTION(WITH_TIFF          "Enable LibTIFF Support" ON)
-OPTION(WITH_DDS           "Enable DDS Support" ON)
+OPTION(WITH_IMAGE_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
+OPTION(WITH_IMAGE_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
+OPTION(WITH_IMAGE_TIFF          "Enable LibTIFF Support" ON)
+OPTION(WITH_IMAGE_DDS           "Enable DDS Image Support" ON)
+OPTION(WITH_IMAGE_CINEON        "Enable CINEON and DPX Image Support" ON)
+OPTION(WITH_IMAGE_HDR           "Enable HDR Image Support" ON)
 
 # Audio format support
 OPTION(WITH_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
@@ -117,6 +117,7 @@
 OPTION(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON) 
 OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
+OPTION(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
 
 IF(APPLE)
 	OPTION(WITH_COCOA	  "Use Cocoa framework instead of deprecated Carbon" ON)
@@ -132,6 +133,10 @@
 	MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
 ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 
+IF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
+	MESSAGE("WARNING: WITH_PYTHON_INSTALL needs WITH_INSTALL")
+ENDIF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
+
 TEST_SSE_SUPPORT()
 
 # disabled for now, not supported
@@ -217,7 +222,7 @@
 		ENDIF(NOT SDL_FOUND)
 	ENDIF(WITH_SDL)
 
-	IF(WITH_OPENEXR)
+	IF(WITH_IMAGE_OPENEXR)
 		SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
 		FIND_PATH(OPENEXR_INC
 			ImfXdr.h
@@ -232,16 +237,16 @@
 		SET(OPENEXR_LIB Half IlmImf Iex Imath)
 		
 		IF(NOT OPENEXR_INC)
-			SET(WITH_OPENEXR OFF)
+			SET(WITH_IMAGE_OPENEXR OFF)
 		ENDIF(NOT OPENEXR_INC)
-	ENDIF(WITH_OPENEXR)
+	ENDIF(WITH_IMAGE_OPENEXR)
 
-	IF(WITH_TIFF)
+	IF(WITH_IMAGE_TIFF)
 		FIND_PACKAGE(TIFF)
 		IF(NOT TIFF_FOUND)
-			SET(WITH_TIFF OFF)
+			SET(WITH_IMAGE_TIFF OFF)
 		ENDIF(NOT TIFF_FOUND)
-	ENDIF(WITH_TIFF)
+	ENDIF(WITH_IMAGE_TIFF)
 
 	FIND_PACKAGE(JPEG REQUIRED)
 
@@ -261,6 +266,7 @@
 		SET(FFMPEG_INC ${FFMPEG}/include)
 		SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
 		SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
 	ENDIF(WITH_FFMPEG)
 
 	IF(WITH_FFTW3)
@@ -310,12 +316,6 @@
 
 	SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -Wno-char-subscripts")
 
-	IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
-		SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}")
-		ADD_DEFINITIONS(-D__SSE__)
-		ADD_DEFINITIONS(-D__MMX__)
-	ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
-
 	SET(PLATFORM_LINKFLAGS "-pthread")
 
 	# Better warnings
@@ -484,7 +484,7 @@
 			SET(PCRE_LIB pcre)
 		ENDIF(WITH_OPENCOLLADA)
 		
-        # TODO: IF(WITH_LCMS)
+		# TODO: IF(WITH_LCMS)
         
 		IF(WITH_FFMPEG)
 			SET(FFMPEG ${LIBDIR}/ffmpeg)
@@ -493,7 +493,7 @@
 			SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
 		ENDIF(WITH_FFMPEG)
 
-		IF(WITH_OPENEXR)
+		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)
@@ -505,14 +505,14 @@
 			IF (MSVC90)
 				SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
 			ENDIF(MSVC90)
-		ENDIF(WITH_OPENEXR)
+		ENDIF(WITH_IMAGE_OPENEXR)
 
-		IF(WITH_TIFF)
+		IF(WITH_IMAGE_TIFF)
 			SET(TIFF ${LIBDIR}/tiff)
 			SET(TIFF_LIBRARY libtiff)
 			SET(TIFF_INCLUDE_DIR ${TIFF}/include)
 			SET(TIFF_LIBPATH ${TIFF}/lib)
-		ENDIF(WITH_TIFF)
+		ENDIF(WITH_IMAGE_TIFF)
 
 		IF(WITH_JACK)
 			SET(JACK ${LIBDIR}/jack)
@@ -533,7 +533,7 @@
 	ELSE(MSVC) # MINGW
 		SET(LLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
 
-		SET(CMAKE_CXX_FLAGS                "-pipe -funsigned-char -fno-strict-aliasing -mwindows" CACHE STRING "Mingw C++ flags ")
+		SET(CMAKE_CXX_FLAGS                "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C++ flags ")
 		SET(CMAKE_C_FLAGS                  "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C flags ")
 
 		SET(CMAKE_CXX_FLAGS_DEBUG          "-O0 -g" CACHE STRING "Mingw debug C++ flags ")
@@ -560,7 +560,7 @@
 			SET(GETTEXT_LIB intl)
 		ENDIF(WITH_INTERNATIONAL)
 
-		SET(JPEG_LIBRARY jpeg)
+		SET(JPEG_LIBRARY libjpeg)
 		SET(PNG_LIBRARIES png)
 
 		SET(ZLIB ${LIBDIR}/zlib)
@@ -603,19 +603,19 @@
 			SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
 		ENDIF(WITH_FFMPEG)
 
-		IF(WITH_OPENEXR)
+		IF(WITH_IMAGE_OPENEXR)
 			SET(OPENEXR ${LIBDIR}/gcc/openexr)
 			SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR)
-			SET(OPENEXR_LIB Half IlmImf Iex)
+			SET(OPENEXR_LIB Half IlmImf Imath IlmThread)
 			SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
-		ENDIF(WITH_OPENEXR)
+		ENDIF(WITH_IMAGE_OPENEXR)
 
-		IF(WITH_TIFF)
+		IF(WITH_IMAGE_TIFF)
 			SET(TIFF ${LIBDIR}/gcc/tiff)
 			SET(TIFF_LIBRARY tiff)
 			SET(TIFF_INCLUDE_DIR ${TIFF}/include)
 			SET(TIFF_LIBPATH ${TIFF}/lib)
-		ENDIF(WITH_TIFF)
+		ENDIF(WITH_IMAGE_TIFF)
 
 		IF(WITH_JACK)
 			SET(JACK ${LIBDIR}/jack)
@@ -717,12 +717,12 @@
 	SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
 	SET(FREETYPE_LIBRARY freetype)
 
-	IF(WITH_OPENEXR)
+	IF(WITH_IMAGE_OPENEXR)
 		SET(OPENEXR ${LIBDIR}/openexr)
 		SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
 		SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
 		SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
-	ENDIF(WITH_OPENEXR)
+	ENDIF(WITH_IMAGE_OPENEXR)
 
 	IF(WITH_LCMS)
 		SET(LCMS ${LIBDIR}/lcms)
@@ -736,6 +736,7 @@
 		SET(FFMPEG_INC ${FFMPEG}/include)
 		SET(FFMPEG_LIB avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg)
 		SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
 	ENDIF(WITH_FFMPEG)
 
 	SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
@@ -799,19 +800,13 @@
 	SET(JPEG_INC "${JPEG}/include")
 	SET(JPEG_LIBPATH ${JPEG}/lib)
 
-	IF(WITH_TIFF)
+	IF(WITH_IMAGE_TIFF)
 		SET(TIFF ${LIBDIR}/tiff)
 		SET(TIFF_INCLUDE_DIR ${TIFF}/include)
 		SET(TIFF_LIBRARY tiff)
 		SET(TIFF_LIBPATH ${TIFF}/lib)
-	ENDIF(WITH_TIFF)
+	ENDIF(WITH_IMAGE_TIFF)
 
-	IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
-		SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}")
-		ADD_DEFINITIONS(-D__SSE__)
-		ADD_DEFINITIONS(-D__MMX__)
-	ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
-
 	SET(EXETYPE MACOSX_BUNDLE)
 
 	SET(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")
@@ -855,14 +850,31 @@
 		ENDIF(BUILD_REV_RETURN)
 	ENDIF(WIN32)
 ENDIF(WITH_BUILDINFO)
-	
 #-----------------------------------------------------------------------------
 # Common.
-IF(WITH_OPENJPEG)
+
+IF(WITH_RAYOPTIMIZATION)
+	IF(CMAKE_COMPILER_IS_GNUCC)
+		IF(SUPPORT_SSE_BUILD)
+			SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}")
+			ADD_DEFINITIONS(-D__SSE__)
+			ADD_DEFINITIONS(-D__MMX__)
+		ENDIF(SUPPORT_SSE_BUILD)
+		IF(SUPPORT_SSE2_BUILD)
+			SET(PLATFORM_CFLAGS " -msse2 ${PLATFORM_CFLAGS}")
+			ADD_DEFINITIONS(-D__SSE2__)
+			IF(NOT SUPPORT_SSE_BUILD) # dont double up
+				ADD_DEFINITIONS(-D__MMX__)
+			ENDIF(NOT SUPPORT_SSE_BUILD)
+		ENDIF(SUPPORT_SSE2_BUILD)
+	ENDIF(CMAKE_COMPILER_IS_GNUCC)
+ENDIF(WITH_RAYOPTIMIZATION)
+
+IF(WITH_IMAGE_OPENJPEG)
 	set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
 	set(OPENJPEG_INC ${OPENJPEG})
 	set(OPENJPEG_LIb extern_libopenjpeg)
-ENDIF(WITH_OPENJPEG)
+ENDIF(WITH_IMAGE_OPENJPEG)
 
 #-----------------------------------------------------------------------------
 # Blender WebPlugin

Modified: branches/particles-2010/Makefile
===================================================================
--- branches/particles-2010/Makefile	2010-08-15 13:14:52 UTC (rev 31349)
+++ branches/particles-2010/Makefile	2010-08-15 13:53:11 UTC (rev 31350)
@@ -41,16 +41,16 @@
 # export NAN_NO_OPENAL=true
 
 export NANBLENDERHOME=$(shell pwd)
-MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory
+MAKEFLAGS=-I$(NANBLENDERHOME)/build_files/make --no-print-directory
 
 SOURCEDIR = 
 ifeq ($(FREE_WINDOWS),true)
-    DIRS ?= dlltool extern intern source po
+    DIRS ?= $(NANBLENDERHOME)/build_files/make/dlltool extern intern source po
 else
     DIRS ?= extern intern source po
 endif
 
-include source/nan_subdirs.mk
+include build_files/make/nan_subdirs.mk
 
 .PHONY: release
 release:

Modified: branches/particles-2010/SConstruct
===================================================================
--- branches/particles-2010/SConstruct	2010-08-15 13:14:52 UTC (rev 31349)
+++ branches/particles-2010/SConstruct	2010-08-15 13:53:11 UTC (rev 31350)
@@ -46,17 +46,22 @@

@@ Diff output truncated at 10240 characters. @@