[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32408] branches/particles-2010: svn merge -r31715:32407 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Mon Oct 11 09:44:46 CEST 2010

Revision: 32408
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32408
Author:   lukastoenne
Date:     2010-10-11 09:44:20 +0200 (Mon, 11 Oct 2010)

Log Message:
-----------
svn merge -r31715:32407 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/particles-2010/CMakeLists.txt
    branches/particles-2010/SConstruct
    branches/particles-2010/build_files/cmake/macros.cmake
    branches/particles-2010/build_files/scons/config/linux2-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/Blender.py
    branches/particles-2010/build_files/scons/tools/btools.py
    branches/particles-2010/doc/BL-license.txt
    branches/particles-2010/doc/bf-members.txt
    branches/particles-2010/doc/blender.1.py
    branches/particles-2010/extern/binreloc/CMakeLists.txt
    branches/particles-2010/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
    branches/particles-2010/extern/bullet2/src/LinearMath/btQuickprof.cpp
    branches/particles-2010/extern/glew/CMakeLists.txt
    branches/particles-2010/extern/libopenjpeg/CMakeLists.txt
    branches/particles-2010/extern/lzo/CMakeLists.txt
    branches/particles-2010/intern/CMakeLists.txt
    branches/particles-2010/intern/audaspace/CMakeLists.txt
    branches/particles-2010/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
    branches/particles-2010/intern/boolop/CMakeLists.txt
    branches/particles-2010/intern/bsp/CMakeLists.txt
    branches/particles-2010/intern/container/CMakeLists.txt
    branches/particles-2010/intern/decimation/CMakeLists.txt
    branches/particles-2010/intern/decimation/test/decimate_glut_test/intern/common/Makefile
    branches/particles-2010/intern/elbeem/CMakeLists.txt
    branches/particles-2010/intern/ghost/CMakeLists.txt
    branches/particles-2010/intern/ghost/GHOST_Types.h
    branches/particles-2010/intern/ghost/SConscript
    branches/particles-2010/intern/ghost/intern/GHOST_Debug.h
    branches/particles-2010/intern/ghost/intern/GHOST_EventPrinter.cpp
    branches/particles-2010/intern/ghost/intern/GHOST_ModifierKeys.cpp
    branches/particles-2010/intern/ghost/intern/GHOST_ModifierKeys.h
    branches/particles-2010/intern/ghost/intern/GHOST_SystemCarbon.cpp
    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_SystemX11.cpp
    branches/particles-2010/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/particles-2010/intern/ghost/intern/GHOST_WindowManager.cpp
    branches/particles-2010/intern/ghost/test/multitest/EventToBuf.c
    branches/particles-2010/intern/guardedalloc/CMakeLists.txt
    branches/particles-2010/intern/guardedalloc/SConscript
    branches/particles-2010/intern/guardedalloc/cpp/mallocn.cpp
    branches/particles-2010/intern/iksolver/CMakeLists.txt
    branches/particles-2010/intern/itasc/CMakeLists.txt
    branches/particles-2010/intern/memutil/CMakeLists.txt
    branches/particles-2010/intern/moto/CMakeLists.txt
    branches/particles-2010/intern/opennl/CMakeLists.txt
    branches/particles-2010/intern/smoke/CMakeLists.txt
    branches/particles-2010/intern/string/CMakeLists.txt
    branches/particles-2010/intern/string/SConscript
    branches/particles-2010/release/VERSION
    branches/particles-2010/release/bin/blender-thumbnailer.py
    branches/particles-2010/release/datafiles/blenderbuttons
    branches/particles-2010/release/datafiles/splash.png
    branches/particles-2010/release/freedesktop/blender.desktop
    branches/particles-2010/release/getversion.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/operators.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/keyingsets/keyingsets_builtins.py
    branches/particles-2010/release/scripts/modules/add_object_utils.py
    branches/particles-2010/release/scripts/modules/blend_render_info.py
    branches/particles-2010/release/scripts/modules/bpy/__init__.py
    branches/particles-2010/release/scripts/modules/bpy/ops.py
    branches/particles-2010/release/scripts/modules/bpy/path.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/bpyml.py
    branches/particles-2010/release/scripts/modules/bpyml_ui.py
    branches/particles-2010/release/scripts/modules/graphviz_export.py
    branches/particles-2010/release/scripts/modules/io_utils.py
    branches/particles-2010/release/scripts/modules/rigify/eye_balls.py
    branches/particles-2010/release/scripts/modules/rigify/mouth.py
    branches/particles-2010/release/scripts/modules/rigify/shape_key_control.py
    branches/particles-2010/release/scripts/modules/rigify/shape_key_distance.py
    branches/particles-2010/release/scripts/modules/rigify/shape_key_rotdiff.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/animsys_update.py
    branches/particles-2010/release/scripts/op/console_python.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/io_anim_bvh/__init__.py
    branches/particles-2010/release/scripts/op/io_anim_bvh/import_bvh.py
    branches/particles-2010/release/scripts/op/io_mesh_ply/__init__.py
    branches/particles-2010/release/scripts/op/io_mesh_ply/export_ply.py
    branches/particles-2010/release/scripts/op/io_scene_3ds/__init__.py
    branches/particles-2010/release/scripts/op/io_scene_3ds/export_3ds.py
    branches/particles-2010/release/scripts/op/io_scene_3ds/import_3ds.py
    branches/particles-2010/release/scripts/op/io_scene_fbx/__init__.py
    branches/particles-2010/release/scripts/op/io_scene_fbx/export_fbx.py
    branches/particles-2010/release/scripts/op/io_scene_obj/__init__.py
    branches/particles-2010/release/scripts/op/io_scene_obj/export_obj.py
    branches/particles-2010/release/scripts/op/io_scene_obj/import_obj.py
    branches/particles-2010/release/scripts/op/io_scene_x3d/export_x3d.py
    branches/particles-2010/release/scripts/op/io_shape_mdd/__init__.py
    branches/particles-2010/release/scripts/op/io_shape_mdd/export_mdd.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_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/templates/operator.py
    branches/particles-2010/release/scripts/templates/operator_modal.py
    branches/particles-2010/release/scripts/templates/operator_modal_view3d.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_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_node.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/readme.html
    branches/particles-2010/release/windows/extra/Help.url
    branches/particles-2010/release/windows/installer/00.sconsblender.nsi
    branches/particles-2010/source/Makefile
    branches/particles-2010/source/blender/avi/CMakeLists.txt
    branches/particles-2010/source/blender/blenfont/CMakeLists.txt
    branches/particles-2010/source/blender/blenfont/intern/blf_font.c
    branches/particles-2010/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/particles-2010/source/blender/blenkernel/BKE_blender.h
    branches/particles-2010/source/blender/blenkernel/BKE_brush.h
    branches/particles-2010/source/blender/blenkernel/BKE_context.h
    branches/particles-2010/source/blender/blenkernel/BKE_curve.h
    branches/particles-2010/source/blender/blenkernel/BKE_customdata.h
    branches/particles-2010/source/blender/blenkernel/BKE_depsgraph.h
    branches/particles-2010/source/blender/blenkernel/BKE_exotic.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_modifier.h
    branches/particles-2010/source/blender/blenkernel/BKE_multires.h
    branches/particles-2010/source/blender/blenkernel/BKE_node.h
    branches/particles-2010/source/blender/blenkernel/BKE_opencl.h
    branches/particles-2010/source/blender/blenkernel/BKE_particle.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_texture.h
    branches/particles-2010/source/blender/blenkernel/BKE_unit.h
    branches/particles-2010/source/blender/blenkernel/BKE_utildefines.h
    branches/particles-2010/source/blender/blenkernel/CMakeLists.txt
    branches/particles-2010/source/blender/blenkernel/SConscript
    branches/particles-2010/source/blender/blenkernel/intern/DerivedMesh.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/boids.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/constraint.c
    branches/particles-2010/source/blender/blenkernel/intern/context.c
    branches/particles-2010/source/blender/blenkernel/intern/curve.c
    branches/particles-2010/source/blender/blenkernel/intern/customdata.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/exotic.c
    branches/particles-2010/source/blender/blenkernel/intern/fluidsim.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/idprop.c
    branches/particles-2010/source/blender/blenkernel/intern/image.c
    branches/particles-2010/source/blender/blenkernel/intern/ipo.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/mesh.c
    branches/particles-2010/source/blender/blenkernel/intern/modifier.c
    branches/particles-2010/source/blender/blenkernel/intern/multires.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/packedFile.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/report.c
    branches/particles-2010/source/blender/blenkernel/intern/scene.c
    branches/particles-2010/source/blender/blenkernel/intern/seqcache.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/shrinkwrap.c
    branches/particles-2010/source/blender/blenkernel/intern/smoke.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/texture.c
    branches/particles-2010/source/blender/blenkernel/intern/unit.c
    branches/particles-2010/source/blender/blenkernel/intern/writeffmpeg.c
    branches/particles-2010/source/blender/blenlib/BLI_editVert.h
    branches/particles-2010/source/blender/blenlib/BLI_fileops.h
    branches/particles-2010/source/blender/blenlib/BLI_math_base.h
    branches/particles-2010/source/blender/blenlib/BLI_math_color.h
    branches/particles-2010/source/blender/blenlib/BLI_math_geom.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_storage.h
    branches/particles-2010/source/blender/blenlib/CMakeLists.txt
    branches/particles-2010/source/blender/blenlib/intern/bpath.c
    branches/particles-2010/source/blender/blenlib/intern/dynlib.c
    branches/particles-2010/source/blender/blenlib/intern/fileops.c
    branches/particles-2010/source/blender/blenlib/intern/freetypefont.c
    branches/particles-2010/source/blender/blenlib/intern/math_base_inline.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_matrix.c
    branches/particles-2010/source/blender/blenlib/intern/math_rotation.c
    branches/particles-2010/source/blender/blenlib/intern/math_vector.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/storage.c
    branches/particles-2010/source/blender/blenlib/intern/string.c
    branches/particles-2010/source/blender/blenlib/intern/winstuff.c
    branches/particles-2010/source/blender/blenloader/CMakeLists.txt
    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/writefile.c
    branches/particles-2010/source/blender/blenpluginapi/CMakeLists.txt
    branches/particles-2010/source/blender/collada/CMakeLists.txt
    branches/particles-2010/source/blender/collada/DocumentExporter.cpp
    branches/particles-2010/source/blender/collada/DocumentExporter.h
    branches/particles-2010/source/blender/collada/DocumentImporter.cpp
    branches/particles-2010/source/blender/collada/DocumentImporter.h
    branches/particles-2010/source/blender/collada/collada.cpp
    branches/particles-2010/source/blender/collada/collada_internal.h
    branches/particles-2010/source/blender/editors/animation/anim_channels_defines.c
    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_ipo_utils.c
    branches/particles-2010/source/blender/editors/animation/anim_markers.c
    branches/particles-2010/source/blender/editors/animation/drivers.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/CMakeLists.txt
    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/meshlaplacian.c
    branches/particles-2010/source/blender/editors/armature/meshlaplacian.h
    branches/particles-2010/source/blender/editors/armature/poseSlide.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/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/blenderbuttons.c
    branches/particles-2010/source/blender/editors/datafiles/splash.png.c
    branches/particles-2010/source/blender/editors/gpencil/drawgpencil.c
    branches/particles-2010/source/blender/editors/include/ED_armature.h
    branches/particles-2010/source/blender/editors/include/ED_keyframing.h
    branches/particles-2010/source/blender/editors/include/ED_mesh.h
    branches/particles-2010/source/blender/editors/include/ED_object.h
    branches/particles-2010/source/blender/editors/include/ED_screen.h
    branches/particles-2010/source/blender/editors/include/ED_screen_types.h
    branches/particles-2010/source/blender/editors/include/UI_interface.h
    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_intern.h
    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_regions.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/view2d_ops.c
    branches/particles-2010/source/blender/editors/mesh/CMakeLists.txt
    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_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_ops.c
    branches/particles-2010/source/blender/editors/mesh/meshtools.c
    branches/particles-2010/source/blender/editors/object/CMakeLists.txt
    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_modifier.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_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/particle_edit.c
    branches/particles-2010/source/blender/editors/physics/particle_object.c
    branches/particles-2010/source/blender/editors/render/CMakeLists.txt
    branches/particles-2010/source/blender/editors/render/render_opengl.c
    branches/particles-2010/source/blender/editors/render/render_shading.c
    branches/particles-2010/source/blender/editors/screen/CMakeLists.txt
    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_ops.c
    branches/particles-2010/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/particles-2010/source/blender/editors/sculpt_paint/paint_image.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/sound/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_action/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_api/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_buttons/CMakeLists.txt
    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/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_console/console_draw.c
    branches/particles-2010/source/blender/editors/space_console/console_intern.h
    branches/particles-2010/source/blender/editors/space_console/console_ops.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_intern.h
    branches/particles-2010/source/blender/editors/space_file/file_ops.c
    branches/particles-2010/source/blender/editors/space_file/file_panels.c
    branches/particles-2010/source/blender/editors/space_file/filelist.c
    branches/particles-2010/source/blender/editors/space_file/filelist.h
    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_graph/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_graph/graph_buttons.c
    branches/particles-2010/source/blender/editors/space_image/CMakeLists.txt
    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_ops.c
    branches/particles-2010/source/blender/editors/space_image/space_image.c
    branches/particles-2010/source/blender/editors/space_info/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_logic/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_logic/logic_window.c
    branches/particles-2010/source/blender/editors/space_nla/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_nla/nla_buttons.c
    branches/particles-2010/source/blender/editors/space_nla/nla_draw.c
    branches/particles-2010/source/blender/editors/space_node/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_node/drawnode.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/space_node.c
    branches/particles-2010/source/blender/editors/space_outliner/CMakeLists.txt
    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/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_sequencer/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_sequencer/sequencer_add.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_ops.c
    branches/particles-2010/source/blender/editors/space_sequencer/space_sequencer.c
    branches/particles-2010/source/blender/editors/space_sound/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_text/CMakeLists.txt
    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_ops.c
    branches/particles-2010/source/blender/editors/space_text/text_python.c
    branches/particles-2010/source/blender/editors/space_time/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_time/space_time.c
    branches/particles-2010/source/blender/editors/space_userpref/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_view3d/CMakeLists.txt
    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/space_view3d.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_intern.h
    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/CMakeLists.txt
    branches/particles-2010/source/blender/editors/transform/SConscript
    branches/particles-2010/source/blender/editors/transform/transform.c
    branches/particles-2010/source/blender/editors/transform/transform.h
    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_manipulator.c
    branches/particles-2010/source/blender/editors/transform/transform_ops.c
    branches/particles-2010/source/blender/editors/transform/transform_snap.c
    branches/particles-2010/source/blender/editors/util/CMakeLists.txt
    branches/particles-2010/source/blender/editors/uvedit/CMakeLists.txt
    branches/particles-2010/source/blender/editors/uvedit/uvedit_ops.c
    branches/particles-2010/source/blender/gpu/CMakeLists.txt
    branches/particles-2010/source/blender/gpu/intern/gpu_draw.c
    branches/particles-2010/source/blender/gpu/intern/gpu_material.c
    branches/particles-2010/source/blender/ikplugin/BIK_api.h
    branches/particles-2010/source/blender/ikplugin/CMakeLists.txt
    branches/particles-2010/source/blender/ikplugin/SConscript
    branches/particles-2010/source/blender/ikplugin/intern/Makefile
    branches/particles-2010/source/blender/ikplugin/intern/ikplugin_api.c
    branches/particles-2010/source/blender/ikplugin/intern/itasc_plugin.cpp
    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/intern/IMB_filetype.h
    branches/particles-2010/source/blender/imbuf/intern/allocimbuf.c
    branches/particles-2010/source/blender/imbuf/intern/bmp.c
    branches/particles-2010/source/blender/imbuf/intern/cineon/CMakeLists.txt
    branches/particles-2010/source/blender/imbuf/intern/dds/CMakeLists.txt
    branches/particles-2010/source/blender/imbuf/intern/dds/dds_api.cpp
    branches/particles-2010/source/blender/imbuf/intern/dds/dds_api.h
    branches/particles-2010/source/blender/imbuf/intern/filetype.c
    branches/particles-2010/source/blender/imbuf/intern/iris.c
    branches/particles-2010/source/blender/imbuf/intern/jp2.c
    branches/particles-2010/source/blender/imbuf/intern/jpeg.c
    branches/particles-2010/source/blender/imbuf/intern/module.c
    branches/particles-2010/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/particles-2010/source/blender/imbuf/intern/openexr/openexr_api.h
    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/readimage.c
    branches/particles-2010/source/blender/imbuf/intern/scaling.c
    branches/particles-2010/source/blender/imbuf/intern/targa.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/makesdna/DNA_boid_types.h
    branches/particles-2010/source/blender/makesdna/DNA_curve_types.h
    branches/particles-2010/source/blender/makesdna/DNA_customdata_types.h
    branches/particles-2010/source/blender/makesdna/DNA_object_force.h
    branches/particles-2010/source/blender/makesdna/DNA_scene_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_vec_types.h
    branches/particles-2010/source/blender/makesdna/DNA_vfont_types.h
    branches/particles-2010/source/blender/makesdna/DNA_view3d_types.h
    branches/particles-2010/source/blender/makesdna/DNA_windowmanager_types.h
    branches/particles-2010/source/blender/makesdna/intern/CMakeLists.txt
    branches/particles-2010/source/blender/makesdna/intern/makesdna.c
    branches/particles-2010/source/blender/makesrna/RNA_access.h
    branches/particles-2010/source/blender/makesrna/RNA_define.h
    branches/particles-2010/source/blender/makesrna/intern/CMakeLists.txt
    branches/particles-2010/source/blender/makesrna/intern/makesrna.c
    branches/particles-2010/source/blender/makesrna/intern/rna_ID.c
    branches/particles-2010/source/blender/makesrna/intern/rna_access.c
    branches/particles-2010/source/blender/makesrna/intern/rna_animation.c
    branches/particles-2010/source/blender/makesrna/intern/rna_armature.c
    branches/particles-2010/source/blender/makesrna/intern/rna_armature_api.c
    branches/particles-2010/source/blender/makesrna/intern/rna_boid.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_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_image.c
    branches/particles-2010/source/blender/makesrna/intern/rna_internal.h
    branches/particles-2010/source/blender/makesrna/intern/rna_lamp.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_meta.c
    branches/particles-2010/source/blender/makesrna/intern/rna_modifier.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_api.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_sensor.c
    branches/particles-2010/source/blender/makesrna/intern/rna_sequencer.c
    branches/particles-2010/source/blender/makesrna/intern/rna_space.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_update.sh
    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_bevel.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_boolean.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_build.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_decimate.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_displace.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_explode.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_none.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_particlesystem.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_screw.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_shapekey.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_smooth.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_softbody.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_solidify.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_subsurf.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_surface.c
    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/nodes/CMakeLists.txt
    branches/particles-2010/source/blender/nodes/intern/composite/node_tree_composite.c
    branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_displace.c
    branches/particles-2010/source/blender/nodes/intern/composite/nodes/CMP_image.c
    branches/particles-2010/source/blender/python/CMakeLists.txt
    branches/particles-2010/source/blender/python/doc/alternative/epy/PhysicsConstraints.py
    branches/particles-2010/source/blender/python/doc/alternative/epy/VideoTexture.py
    branches/particles-2010/source/blender/python/doc/alternative/epy/geometry.py
    branches/particles-2010/source/blender/python/doc/alternative/epy/idprop.py
    branches/particles-2010/source/blender/python/doc/alternative/epyparser.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/aud.Device.lock.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/aud.Factory.filter.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/aud.Factory.join.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/aud.Factory.pingpong.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/aud.Factory.sine.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/idprop.IDGroup.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/idprop.IDGroup.values.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/idprop.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/mathutils.Euler.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/mathutils.Matrix.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/mathutils.Quaternion.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/mathutils.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/cache.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/ext/preprocessors.py
    branches/particles-2010/source/blender/python/doc/epy/Geometry.py
    branches/particles-2010/source/blender/python/doc/epy/IDProp.py
    branches/particles-2010/source/blender/python/doc/examples/mathutils.Euler.py
    branches/particles-2010/source/blender/python/doc/examples/mathutils.Matrix.py
    branches/particles-2010/source/blender/python/doc/examples/mathutils.Quaternion.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/doc/sphinx_doc_gen.sh
    branches/particles-2010/source/blender/python/generic/IDProp.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/mathutils.c
    branches/particles-2010/source/blender/python/generic/mathutils_euler.c
    branches/particles-2010/source/blender/python/generic/mathutils_vector.c
    branches/particles-2010/source/blender/python/generic/py_capi_utils.c
    branches/particles-2010/source/blender/python/generic/py_capi_utils.h
    branches/particles-2010/source/blender/python/intern/bpy.c
    branches/particles-2010/source/blender/python/intern/bpy.h
    branches/particles-2010/source/blender/python/intern/bpy_array.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_props.c
    branches/particles-2010/source/blender/python/intern/bpy_props.h
    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/quicktime/CMakeLists.txt
    branches/particles-2010/source/blender/quicktime/apple/qtkit_export.m
    branches/particles-2010/source/blender/quicktime/apple/qtkit_import.m
    branches/particles-2010/source/blender/quicktime/apple/quicktime_import.c
    branches/particles-2010/source/blender/quicktime/quicktime_import.h
    branches/particles-2010/source/blender/readblenfile/intern/BLO_readblenfile.c
    branches/particles-2010/source/blender/render/CMakeLists.txt
    branches/particles-2010/source/blender/render/extern/include/RE_render_ext.h
    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/imagetexture.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/rendercore.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/texture.c
    branches/particles-2010/source/blender/render/intern/source/volumetric.c
    branches/particles-2010/source/blender/windowmanager/CMakeLists.txt
    branches/particles-2010/source/blender/windowmanager/WM_api.h
    branches/particles-2010/source/blender/windowmanager/WM_types.h
    branches/particles-2010/source/blender/windowmanager/intern/wm.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_operators.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_window.c
    branches/particles-2010/source/blender/windowmanager/wm_event_types.h
    branches/particles-2010/source/blender/windowmanager/wm_window.h
    branches/particles-2010/source/blenderplayer/CMakeLists.txt
    branches/particles-2010/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
    branches/particles-2010/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/particles-2010/source/creator/CMakeLists.txt
    branches/particles-2010/source/creator/buildinfo.c
    branches/particles-2010/source/creator/creator.c
    branches/particles-2010/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/particles-2010/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/particles-2010/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/particles-2010/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/particles-2010/source/gameengine/BlenderRoutines/KX_BlenderGL.h
    branches/particles-2010/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
    branches/particles-2010/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
    branches/particles-2010/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp
    branches/particles-2010/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/particles-2010/source/gameengine/BlenderRoutines/KX_BlenderSystem.cpp
    branches/particles-2010/source/gameengine/BlenderRoutines/SConscript
    branches/particles-2010/source/gameengine/CMakeLists.txt
    branches/particles-2010/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/particles-2010/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/particles-2010/source/gameengine/Converter/BL_MeshDeformer.cpp
    branches/particles-2010/source/gameengine/Converter/BL_MeshDeformer.h
    branches/particles-2010/source/gameengine/Converter/BL_ModifierDeformer.cpp
    branches/particles-2010/source/gameengine/Converter/BL_ModifierDeformer.h
    branches/particles-2010/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/particles-2010/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/particles-2010/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/particles-2010/source/gameengine/Converter/BL_SkinDeformer.h
    branches/particles-2010/source/gameengine/Converter/BlenderWorldInfo.cpp
    branches/particles-2010/source/gameengine/Converter/BlenderWorldInfo.h
    branches/particles-2010/source/gameengine/Converter/CMakeLists.txt
    branches/particles-2010/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/particles-2010/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/particles-2010/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/particles-2010/source/gameengine/Converter/KX_IpoConvert.cpp
    branches/particles-2010/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
    branches/particles-2010/source/gameengine/Converter/KX_SoftBodyDeformer.h
    branches/particles-2010/source/gameengine/Converter/SConscript
    branches/particles-2010/source/gameengine/Expressions/CMakeLists.txt
    branches/particles-2010/source/gameengine/Expressions/PyObjectPlus.h
    branches/particles-2010/source/gameengine/Expressions/SConscript
    branches/particles-2010/source/gameengine/Expressions/Value.h
    branches/particles-2010/source/gameengine/Expressions/VectorValue.cpp
    branches/particles-2010/source/gameengine/GameLogic/CMakeLists.txt
    branches/particles-2010/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
    branches/particles-2010/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
    branches/particles-2010/source/gameengine/GameLogic/SCA_DelaySensor.cpp
    branches/particles-2010/source/gameengine/GameLogic/SCA_LogicManager.h
    branches/particles-2010/source/gameengine/GameLogic/SCA_MouseManager.cpp
    branches/particles-2010/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/particles-2010/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
    branches/particles-2010/source/gameengine/GameLogic/SConscript
    branches/particles-2010/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/particles-2010/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/particles-2010/source/gameengine/Ketsji/CMakeLists.txt
    branches/particles-2010/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
    branches/particles-2010/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/particles-2010/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
    branches/particles-2010/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    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_GameObject.h
    branches/particles-2010/source/gameengine/Ketsji/KX_IPO_SGController.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_Light.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_PyMath.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_Scene.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
    branches/particles-2010/source/gameengine/Ketsji/KX_TimeLogger.h
    branches/particles-2010/source/gameengine/Ketsji/SConscript
    branches/particles-2010/source/gameengine/Network/SConscript
    branches/particles-2010/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/particles-2010/source/gameengine/Physics/Bullet/SConscript
    branches/particles-2010/source/gameengine/Physics/Dummy/SConscript
    branches/particles-2010/source/gameengine/Physics/common/SConscript
    branches/particles-2010/source/gameengine/PyDoc/PhysicsConstraints.py
    branches/particles-2010/source/gameengine/PyDoc/VideoTexture.py
    branches/particles-2010/source/gameengine/PyDoc/bge.events.rst
    branches/particles-2010/source/gameengine/PyDoc/bge.logic.rst
    branches/particles-2010/source/gameengine/PyDoc/bge.types.rst
    branches/particles-2010/source/gameengine/PyDoc/how_to_build_win.txt
    branches/particles-2010/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/particles-2010/source/gameengine/Rasterizer/RAS_Deformer.h
    branches/particles-2010/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/particles-2010/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/particles-2010/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/particles-2010/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/particles-2010/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    branches/particles-2010/source/gameengine/Rasterizer/RAS_Polygon.cpp
    branches/particles-2010/source/gameengine/Rasterizer/SConscript
    branches/particles-2010/source/gameengine/SConscript
    branches/particles-2010/source/gameengine/SceneGraph/SConscript
    branches/particles-2010/source/gameengine/VideoTexture/CMakeLists.txt
    branches/particles-2010/source/icons/winblender.ico
    branches/particles-2010/source/kernel/CMakeLists.txt
    branches/particles-2010/source/kernel/gen_system/GEN_HashedPtr.cpp

Added Paths:
-----------
    branches/particles-2010/build_files/package_spec/
    branches/particles-2010/build_files/package_spec/pacman/
    branches/particles-2010/build_files/package_spec/pacman/PKGBUILD
    branches/particles-2010/build_files/package_spec/pacman/blender.install
    branches/particles-2010/intern/tools/pydna.py
    branches/particles-2010/release/scripts/presets/keyconfig/
    branches/particles-2010/release/scripts/presets/keyconfig/maya.py
    branches/particles-2010/release/test/rna_info_dump.py
    branches/particles-2010/source/blender/collada/AnimationImporter.cpp
    branches/particles-2010/source/blender/collada/AnimationImporter.h
    branches/particles-2010/source/blender/collada/ArmatureExporter.cpp
    branches/particles-2010/source/blender/collada/ArmatureExporter.h
    branches/particles-2010/source/blender/collada/ArmatureImporter.cpp
    branches/particles-2010/source/blender/collada/ArmatureImporter.h
    branches/particles-2010/source/blender/collada/CameraExporter.cpp
    branches/particles-2010/source/blender/collada/CameraExporter.h
    branches/particles-2010/source/blender/collada/EffectExporter.cpp
    branches/particles-2010/source/blender/collada/EffectExporter.h
    branches/particles-2010/source/blender/collada/GeometryExporter.cpp
    branches/particles-2010/source/blender/collada/GeometryExporter.h
    branches/particles-2010/source/blender/collada/ImageExporter.cpp
    branches/particles-2010/source/blender/collada/ImageExporter.h
    branches/particles-2010/source/blender/collada/InstanceWriter.cpp
    branches/particles-2010/source/blender/collada/InstanceWriter.h
    branches/particles-2010/source/blender/collada/LightExporter.cpp
    branches/particles-2010/source/blender/collada/LightExporter.h
    branches/particles-2010/source/blender/collada/MaterialExporter.cpp
    branches/particles-2010/source/blender/collada/MaterialExporter.h
    branches/particles-2010/source/blender/collada/MeshImporter.cpp
    branches/particles-2010/source/blender/collada/MeshImporter.h
    branches/particles-2010/source/blender/collada/SkinInfo.cpp
    branches/particles-2010/source/blender/collada/SkinInfo.h
    branches/particles-2010/source/blender/collada/TransformReader.cpp
    branches/particles-2010/source/blender/collada/TransformReader.h
    branches/particles-2010/source/blender/collada/TransformWriter.cpp
    branches/particles-2010/source/blender/collada/TransformWriter.h
    branches/particles-2010/source/blender/collada/collada_internal.cpp
    branches/particles-2010/source/blender/collada/collada_utils.cpp
    branches/particles-2010/source/blender/collada/collada_utils.h

Removed Paths:
-------------
    branches/particles-2010/build_files/package_spec/pacman/
    branches/particles-2010/build_files/package_spec/pacman/PKGBUILD
    branches/particles-2010/build_files/package_spec/pacman/blender.install
    branches/particles-2010/projectfiles/
    branches/particles-2010/projectfiles_vc7/
    branches/particles-2010/projectfiles_vc9/
    branches/particles-2010/release/scripts/cfg/
    branches/particles-2010/release/scripts/presets/interaction/maya.py
    branches/particles-2010/release/scripts/presets/keyconfig/maya.py
    branches/particles-2010/source/icons/wincreator.ico
    branches/particles-2010/source/icons/wincreator.rc
    branches/particles-2010/source/icons/winlockedfile.ico
    branches/particles-2010/source/icons/winplayer.ico
    branches/particles-2010/source/icons/winplayer.rc
    branches/particles-2010/source/icons/winpublisher.ico
    branches/particles-2010/source/icons/winpublisher.rc

Property Changed:
----------------
    branches/particles-2010/


Property changes on: branches/particles-2010
___________________________________________________________________
Name: svn:ignore
   - *.pdb
.*
TAGS
build
cscope.out
install
mingw
mingw-user-config.py
mingw-user-config_debug.py
msvc
msvc-user-config.py
obj
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
user-def.mk

   + *.pdb
.*
TAGS
build
cscope.out
install
mingw
mingw-user-config.py
mingw-user-config_debug.py
msvc
msvc-user-config.py
obj
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
user-def.mk
graphicall_32b
graphicall_64b
graphicall_64b_debug
installer_32b
installer_64b


Modified: branches/particles-2010/CMakeLists.txt
===================================================================

--- branches/particles-2010/CMakeLists.txt	2010-10-11 04:52:40 UTC (rev 32407)
+++ branches/particles-2010/CMakeLists.txt	2010-10-11 07:44:20 UTC (rev 32408)
@@ -70,6 +70,7 @@
 OPTION(WITH_PYTHON        "Enable Embedded Python API" ON)
 OPTION(WITH_BUILDINFO     "Include extra build details" ON)
 OPTION(WITH_FLUID        "Enable Elbeem (Fluid Simulation)" ON)
+OPTION(WITH_IK_ITASC      "Enable ITASC IK solver" ON)
 OPTION(WITH_FFTW3         "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
 OPTION(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 OPTION(WITH_OPENCL        "Enable OpenCL" OFF)
@@ -126,9 +127,6 @@
 	OPTION(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)
 ENDIF(APPLE)
 
-IF(NOT WITH_BULLET AND WITH_GAMEENGINE)
-	MESSAGE("WARNING: WITH_GAMEENGINE needs WITH_BULLET")
-ENDIF(NOT WITH_BULLET AND WITH_GAMEENGINE)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 	MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -301,11 +299,12 @@
 
 	FIND_PACKAGE(X11 REQUIRED)
 
+	# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
 	SET(LLIBS "-lutil -lc -lm -lpthread -lstdc++ ${X11_X11_LIB} ${X11_Xinput_LIB}")
 
 	IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		# BSD's dont use libdl.so
-		SET(LLIBS "${LLIBS} -ldl")
+		LIST(APPEND LLIBS -ldl)
 
 		# binreloc is linux only
 		SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
@@ -313,13 +312,13 @@
 	ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 	IF(WITH_OPENMP)
-		SET(LLIBS "${LLIBS} -lgomp")
+		LIST(APPEND LLIBS -lgomp)
 		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
 	ENDIF(WITH_OPENMP)
 
 
-	SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -Wno-char-subscripts")
+	SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
 
 	SET(PLATFORM_LINKFLAGS "-pthread")
 
@@ -368,15 +367,6 @@
 
 	SET(WINTAB_INC ${LIBDIR}/wintab/include) 
 
-	IF(WITH_PYTHON)
-		SET(PYTHON ${LIBDIR}/python)
-		SET(PYTHON_VERSION 3.1)
-		SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
-		# SET(PYTHON_BINARY python) # not used yet
-		SET(PYTHON_LIB python31)
-		SET(PYTHON_LIBPATH ${PYTHON}/lib)
-	ENDIF(WITH_PYTHON)
-
 	IF(WITH_OPENAL)
 		SET(OPENAL ${LIBDIR}/openal)
 		SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
@@ -406,8 +396,7 @@
 	ENDIF(WITH_QUICKTIME)
 
 	IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
-		ADD_DEFINITIONS(-D__SSE__)
-		ADD_DEFINITIONS(-D__MMX__)
+		ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
 	ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
 
 	IF(MSVC)
@@ -491,13 +480,15 @@
 			SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
 			SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
 			SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa)
-			#pcre is bundled with openCollada
-			#SET(PCRE ${LIBDIR}/pcre)
-			#SET(PCRE_LIBPATH ${PCRE}/lib)
 			SET(PCRE_LIB pcre)
 		ENDIF(WITH_OPENCOLLADA)
 		
-		# TODO: IF(WITH_LCMS)
+		IF(WITH_LCMS)
+			SET(LCMS ${LIBDIR}/lcms)
+			SET(LCMS_INCLUDE_DIR ${LCMS}/include)
+			SET(LCMS_LIBPATH ${LCMS}/lib)
+			SET(LCMS_LIB lcms)
+		ENDIF(WITH_LCMS)
         
 		IF(WITH_FFMPEG)
 			SET(FFMPEG ${LIBDIR}/ffmpeg)
@@ -534,6 +525,15 @@
 			SET(JACK_LIBPATH ${JACK}/lib)
 		ENDIF(WITH_JACK)
 
+		IF(WITH_PYTHON)
+			SET(PYTHON ${LIBDIR}/python)
+			SET(PYTHON_VERSION 3.1)
+			SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+			# SET(PYTHON_BINARY python) # not used yet
+			SET(PYTHON_LIB python31)
+			SET(PYTHON_LIBPATH ${PYTHON}/lib)
+		ENDIF(WITH_PYTHON)
+
 		# MSVC only, Mingw doesnt need
 		IF(CMAKE_CL_64)
 			SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
@@ -545,21 +545,28 @@
 
 	ELSE(MSVC) # MINGW
 		SET(LLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
+		SET(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
 
-		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 ")
+		# Better warnings
+		SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas")
+		SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
 
-		SET(CMAKE_CXX_FLAGS_DEBUG          "-O0 -g" CACHE STRING "Mingw debug C++ flags ")
-		SET(CMAKE_CXX_FLAGS_RELEASE        "   -O2" CACHE STRING "Mingw release C++ flags ")
-		SET(CMAKE_CXX_FLAGS_MINSIZEREL     "   -Os" CACHE STRING "Mingw minsize release C++ flags ")
-		SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Mingw release, debug C++ flags ")
+		ADD_DEFINITIONS(-DFREE_WINDOWS)
 
-		SET(CMAKE_C_FLAGS_DEBUG            "-O0 -g" CACHE STRING "Mingw debug C flags ")
-		SET(CMAKE_C_FLAGS_RELEASE          "-O2"    CACHE STRING "Mingw release C flags ")
-		SET(CMAKE_C_FLAGS_MINSIZEREL       "-Os"    CACHE STRING "Mingw minsize release C flags ")
-		SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g" CACHE STRING "Mingw release, debug C++ flags ")
-		ADD_DEFINITIONS(-DFREE_WINDOWS)
-		
+		SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
+		SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+
+
+		SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
+		SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG")
+
+		SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -DNDEBUG")
+		SET(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -DNDEBUG")
+
+		SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DNDEBUG")
+		SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DNDEBUG")
+
+
 		IF(WITH_OPENMP)
 			SET(LLIBS "${LLIBS} -lgomp")
 			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
@@ -603,9 +610,6 @@
 			SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
 			SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
 			SET(OPENCOLLADA_LIB OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
-			#pcre is bundled with openCollada
-			#SET(PCRE ${LIBDIR}/pcre)
-			#SET(PCRE_LIBPATH ${PCRE}/lib)
 			SET(PCRE_LIB pcre)
 		ENDIF(WITH_OPENCOLLADA)
 		
@@ -621,6 +625,9 @@
 			SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR)
 			SET(OPENEXR_LIB Half IlmImf Imath IlmThread)
 			SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
+
+			# TODO, gives linking errors, force off
+			SET(WITH_IMAGE_OPENEXR OFF)
 		ENDIF(WITH_IMAGE_OPENEXR)
 
 		IF(WITH_IMAGE_TIFF)
@@ -640,6 +647,15 @@
 			SET(WITH_JACK OFF)
 		ENDIF(WITH_JACK)
 
+		IF(WITH_PYTHON)
+			SET(PYTHON ${LIBDIR}/python)
+			SET(PYTHON_VERSION 3.1)
+			SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+			# SET(PYTHON_BINARY python) # not used yet
+			SET(PYTHON_LIB python31mw)
+			SET(PYTHON_LIBPATH ${PYTHON}/lib)
+		ENDIF(WITH_PYTHON)
+
 	ENDIF(MSVC)
 
 ENDIF(WIN32)
@@ -870,8 +886,7 @@
 	IF(CMAKE_COMPILER_IS_GNUCC)
 		IF(SUPPORT_SSE_BUILD)
 			SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}")
-			ADD_DEFINITIONS(-D__SSE__)
-			ADD_DEFINITIONS(-D__MMX__)
+			ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
 		ENDIF(SUPPORT_SSE_BUILD)
 		IF(SUPPORT_SSE2_BUILD)
 			SET(PLATFORM_CFLAGS " -msse2 ${PLATFORM_CFLAGS}")

Modified: branches/particles-2010/SConstruct
===================================================================
--- branches/particles-2010/SConstruct	2010-10-11 04:52:40 UTC (rev 32407)
+++ branches/particles-2010/SConstruct	2010-10-11 07:44:20 UTC (rev 32408)
@@ -492,6 +492,9 @@
                     dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
                     
                     source=[os.path.join(dp, f) for f in df if f[-3:]!='pyc']
+                    # To ensure empty dirs are created too
+                    if len(source)==0:
+                        env.Execute(Mkdir(dir))
                     scriptinstall.append(env.Install(dir=dir,source=source))
 
 #-- icons

Modified: branches/particles-2010/build_files/cmake/macros.cmake
===================================================================
--- branches/particles-2010/build_files/cmake/macros.cmake	2010-10-11 04:52:40 UTC (rev 32407)
+++ branches/particles-2010/build_files/cmake/macros.cmake	2010-10-11 07:44:20 UTC (rev 32408)
@@ -178,11 +178,17 @@
 				TARGET_LINK_LIBRARIES(${target} optimized ${EXPAT_LIB})
 			ENDIF(EXPAT_LIB)
 		ELSE(WIN32)
-		TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
+			TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
 			TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
 			TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
 		ENDIF(WIN32)
 	ENDIF(WITH_OPENCOLLADA)
+	IF(WITH_LCMS)
+		IF(WIN32)
+			TARGET_LINK_LIBRARIES(${target} debug ${LCMS_LIB}_d)
+			TARGET_LINK_LIBRARIES(${target} optimized ${LCMS_LIB})
+		ENDIF(WIN32)
+	ENDIF(WITH_LCMS)
 	IF(WIN32)
 		TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
 	ENDIF(WIN32)

Copied: branches/particles-2010/build_files/package_spec (from rev 32407, trunk/blender/build_files/package_spec)

Copied: branches/particles-2010/build_files/package_spec/pacman (from rev 32407, trunk/blender/build_files/package_spec/pacman)

Deleted: branches/particles-2010/build_files/package_spec/pacman/PKGBUILD
===================================================================
--- trunk/blender/build_files/package_spec/pacman/PKGBUILD	2010-10-11 04:52:40 UTC (rev 32407)
+++ branches/particles-2010/build_files/package_spec/pacman/PKGBUILD	2010-10-11 07:44:20 UTC (rev 32408)
@@ -1,48 +0,0 @@
-# Maintainer: Campbell Barton <ideasman42 at gmail dot com>
-
-# custom blender vars

@@ Diff output truncated at 10240 characters. @@


