[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33747] branches/particles-2010: svn merge -r33437:33740 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Lukas Toenne lukas.toenne at googlemail.com
Fri Dec 17 17:21:35 CET 2010


Revision: 33747
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33747
Author:   lukastoenne
Date:     2010-12-17 17:21:31 +0100 (Fri, 17 Dec 2010)

Log Message:
-----------
svn merge -r33437:33740 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/particles-2010/CMakeLists.txt
    branches/particles-2010/build_files/cmake/cmake_consistency_check.py
    branches/particles-2010/build_files/cmake/macros.cmake
    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/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/win32-mingw-config.py
    branches/particles-2010/build_files/scons/tools/btools.py
    branches/particles-2010/doc/python_api/sphinx_doc_gen.py
    branches/particles-2010/extern/CMakeLists.txt
    branches/particles-2010/extern/binreloc/CMakeLists.txt
    branches/particles-2010/extern/bullet2/CMakeLists.txt
    branches/particles-2010/extern/bullet2/src/Bullet-C-Api.h
    branches/particles-2010/extern/bullet2/src/BulletCollision/CMakeLists.txt
    branches/particles-2010/extern/bullet2/src/BulletDynamics/CMakeLists.txt
    branches/particles-2010/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
    branches/particles-2010/extern/bullet2/src/CMakeLists.txt
    branches/particles-2010/extern/bullet2/src/LinearMath/CMakeLists.txt
    branches/particles-2010/extern/glew/CMakeLists.txt
    branches/particles-2010/extern/glew/include/GL/glew.h
    branches/particles-2010/extern/libopenjpeg/CMakeLists.txt
    branches/particles-2010/extern/libredcode/CMakeLists.txt
    branches/particles-2010/extern/lzma/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/intern/AUD_C-API.h
    branches/particles-2010/intern/audaspace/intern/AUD_PyInit.h
    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/elbeem/CMakeLists.txt
    branches/particles-2010/intern/ghost/CMakeLists.txt
    branches/particles-2010/intern/ghost/GHOST_C-api.h
    branches/particles-2010/intern/ghost/GHOST_IEvent.h
    branches/particles-2010/intern/ghost/GHOST_IEventConsumer.h
    branches/particles-2010/intern/ghost/GHOST_ISystem.h
    branches/particles-2010/intern/ghost/GHOST_ITimerTask.h
    branches/particles-2010/intern/ghost/GHOST_IWindow.h
    branches/particles-2010/intern/ghost/GHOST_Path-api.h
    branches/particles-2010/intern/ghost/GHOST_Rect.h
    branches/particles-2010/intern/ghost/GHOST_Types.h
    branches/particles-2010/intern/ghost/intern/GHOST_C-api.cpp
    branches/particles-2010/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/particles-2010/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/particles-2010/intern/ghost/intern/GHOST_WindowManager.h
    branches/particles-2010/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/particles-2010/intern/guardedalloc/CMakeLists.txt
    branches/particles-2010/intern/guardedalloc/intern/mallocn.c
    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/memutil/MEM_CacheLimiterC-Api.h
    branches/particles-2010/intern/moto/CMakeLists.txt
    branches/particles-2010/intern/opennl/CMakeLists.txt
    branches/particles-2010/intern/opennl/extern/ONL_opennl.h
    branches/particles-2010/intern/opennl/superlu/util.h
    branches/particles-2010/intern/smoke/CMakeLists.txt
    branches/particles-2010/intern/string/CMakeLists.txt
    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/path.py
    branches/particles-2010/release/scripts/modules/io_utils.py
    branches/particles-2010/release/scripts/modules/rna_prop_ui.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/io_scene_fbx/__init__.py
    branches/particles-2010/release/scripts/op/io_scene_x3d/export_x3d.py
    branches/particles-2010/release/scripts/op/io_shape_mdd/import_mdd.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/uv.py
    branches/particles-2010/release/scripts/op/wm.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/keyconfig/maya.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/ui/properties_data_armature.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_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_material.py
    branches/particles-2010/release/scripts/ui/properties_object.py
    branches/particles-2010/release/scripts/ui/properties_particle.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_graph.py
    branches/particles-2010/release/scripts/ui/space_info.py
    branches/particles-2010/release/scripts/ui/space_sequencer.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/source/CMakeLists.txt
    branches/particles-2010/source/blender/CMakeLists.txt
    branches/particles-2010/source/blender/avi/CMakeLists.txt
    branches/particles-2010/source/blender/blenfont/BLF_api.h
    branches/particles-2010/source/blender/blenfont/CMakeLists.txt
    branches/particles-2010/source/blender/blenfont/intern/blf.c
    branches/particles-2010/source/blender/blenfont/intern/blf_font.c
    branches/particles-2010/source/blender/blenfont/intern/blf_internal_types.h
    branches/particles-2010/source/blender/blenkernel/BKE_animsys.h
    branches/particles-2010/source/blender/blenkernel/BKE_cloth.h
    branches/particles-2010/source/blender/blenkernel/BKE_context.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_fcurve.h
    branches/particles-2010/source/blender/blenkernel/BKE_gpencil.h
    branches/particles-2010/source/blender/blenkernel/BKE_icons.h
    branches/particles-2010/source/blender/blenkernel/BKE_ipo.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_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_object.h
    branches/particles-2010/source/blender/blenkernel/BKE_opencl.h
    branches/particles-2010/source/blender/blenkernel/BKE_property.h
    branches/particles-2010/source/blender/blenkernel/BKE_report.h
    branches/particles-2010/source/blender/blenkernel/BKE_sca.h
    branches/particles-2010/source/blender/blenkernel/BKE_sequencer.h
    branches/particles-2010/source/blender/blenkernel/BKE_sketch.h
    branches/particles-2010/source/blender/blenkernel/BKE_sound.h
    branches/particles-2010/source/blender/blenkernel/BKE_suggestions.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/depsgraph_private.h
    branches/particles-2010/source/blender/blenkernel/intern/BME_Customdata.c
    branches/particles-2010/source/blender/blenkernel/intern/anim.c
    branches/particles-2010/source/blender/blenkernel/intern/anim_sys.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/cdderivedmesh.c
    branches/particles-2010/source/blender/blenkernel/intern/cloth.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/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/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/exotic.c
    branches/particles-2010/source/blender/blenkernel/intern/fcurve.c
    branches/particles-2010/source/blender/blenkernel/intern/fmodifier.c
    branches/particles-2010/source/blender/blenkernel/intern/gpencil.c
    branches/particles-2010/source/blender/blenkernel/intern/icons.c
    branches/particles-2010/source/blender/blenkernel/intern/idcode.c
    branches/particles-2010/source/blender/blenkernel/intern/image.c
    branches/particles-2010/source/blender/blenkernel/intern/image_gen.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/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/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/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/property.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/smoke.c
    branches/particles-2010/source/blender/blenkernel/intern/softbody.c
    branches/particles-2010/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/particles-2010/source/blender/blenkernel/intern/suggestions.c
    branches/particles-2010/source/blender/blenkernel/intern/text.c
    branches/particles-2010/source/blender/blenkernel/intern/unit.c
    branches/particles-2010/source/blender/blenkernel/intern/writeffmpeg.c
    branches/particles-2010/source/blender/blenkernel/intern/writeframeserver.c
    branches/particles-2010/source/blender/blenlib/BLI_args.h
    branches/particles-2010/source/blender/blenlib/BLI_bpath.h
    branches/particles-2010/source/blender/blenlib/BLI_dynstr.h
    branches/particles-2010/source/blender/blenlib/BLI_ghash.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_string.h
    branches/particles-2010/source/blender/blenlib/BLI_threads.h
    branches/particles-2010/source/blender/blenlib/CMakeLists.txt
    branches/particles-2010/source/blender/blenlib/PIL_dynlib.h
    branches/particles-2010/source/blender/blenlib/intern/BLI_args.c
    branches/particles-2010/source/blender/blenlib/intern/BLI_callbacks.h
    branches/particles-2010/source/blender/blenlib/intern/BLI_ghash.c
    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/math_color.c
    branches/particles-2010/source/blender/blenlib/intern/math_geom.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/scanfill.c
    branches/particles-2010/source/blender/blenlib/intern/storage.c
    branches/particles-2010/source/blender/blenloader/CMakeLists.txt
    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/ArmatureImporter.cpp
    branches/particles-2010/source/blender/collada/CMakeLists.txt
    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/editors/CMakeLists.txt
    branches/particles-2010/source/blender/editors/animation/CMakeLists.txt
    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_deps.c
    branches/particles-2010/source/blender/editors/animation/anim_ipo_utils.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/BIF_retarget.h
    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/editarmature.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/meshlaplacian.h
    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/armature/reeb.h
    branches/particles-2010/source/blender/editors/curve/CMakeLists.txt
    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/CMakeLists.txt
    branches/particles-2010/source/blender/editors/datafiles/prvicons.c
    branches/particles-2010/source/blender/editors/gpencil/CMakeLists.txt
    branches/particles-2010/source/blender/editors/gpencil/gpencil_buttons.c
    branches/particles-2010/source/blender/editors/include/BIF_glutil.h
    branches/particles-2010/source/blender/editors/include/ED_anim_api.h
    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_keyframes_edit.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_transform.h
    branches/particles-2010/source/blender/editors/include/ED_util.h
    branches/particles-2010/source/blender/editors/include/ED_uvedit.h
    branches/particles-2010/source/blender/editors/include/ED_view3d.h
    branches/particles-2010/source/blender/editors/include/UI_interface.h
    branches/particles-2010/source/blender/editors/include/UI_interface_icons.h
    branches/particles-2010/source/blender/editors/include/UI_view2d.h
    branches/particles-2010/source/blender/editors/interface/CMakeLists.txt
    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_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_utils.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.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_lib.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/meshtools.c
    branches/particles-2010/source/blender/editors/metaball/CMakeLists.txt
    branches/particles-2010/source/blender/editors/metaball/mball_edit.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_hook.c
    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_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/particleset/particleset_edit.c
    branches/particles-2010/source/blender/editors/physics/CMakeLists.txt
    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_pointcache.c
    branches/particles-2010/source/blender/editors/render/CMakeLists.txt
    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/CMakeLists.txt
    branches/particles-2010/source/blender/editors/screen/area.c
    branches/particles-2010/source/blender/editors/screen/glutil.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/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/sculpt_paint/sculpt_intern.h
    branches/particles-2010/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/particles-2010/source/blender/editors/sound/CMakeLists.txt
    branches/particles-2010/source/blender/editors/sound/sound_ops.c
    branches/particles-2010/source/blender/editors/space_action/CMakeLists.txt
    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_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_console/CMakeLists.txt
    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_file/CMakeLists.txt
    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_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/fsmenu.c
    branches/particles-2010/source/blender/editors/space_file/fsmenu.h
    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_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_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_info/info_ops.c
    branches/particles-2010/source/blender/editors/space_info/info_report.c
    branches/particles-2010/source/blender/editors/space_info/space_info.c
    branches/particles-2010/source/blender/editors/space_info/textview.c
    branches/particles-2010/source/blender/editors/space_logic/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_logic/logic_buttons.c
    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_nla/nla_edit.c
    branches/particles-2010/source/blender/editors/space_nla/nla_select.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_select.c
    branches/particles-2010/source/blender/editors/space_node/node_state.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/outliner_intern.h
    branches/particles-2010/source/blender/editors/space_outliner/outliner_ops.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_intern.h
    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/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_text/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_text/text_draw.c
    branches/particles-2010/source/blender/editors/space_text/text_intern.h
    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_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/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_fly.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/transform/CMakeLists.txt
    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_orientations.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/util/ed_util.c
    branches/particles-2010/source/blender/editors/util/editmode_undo.c
    branches/particles-2010/source/blender/editors/util/undo.c
    branches/particles-2010/source/blender/editors/uvedit/CMakeLists.txt
    branches/particles-2010/source/blender/editors/uvedit/uvedit_draw.c
    branches/particles-2010/source/blender/editors/uvedit/uvedit_intern.h
    branches/particles-2010/source/blender/editors/uvedit/uvedit_ops.c
    branches/particles-2010/source/blender/editors/uvedit/uvedit_parametrizer.h
    branches/particles-2010/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/particles-2010/source/blender/gpu/CMakeLists.txt
    branches/particles-2010/source/blender/gpu/GPU_buffers.h
    branches/particles-2010/source/blender/gpu/GPU_extensions.h
    branches/particles-2010/source/blender/gpu/GPU_material.h
    branches/particles-2010/source/blender/gpu/intern/gpu_codegen.c
    branches/particles-2010/source/blender/gpu/intern/gpu_codegen.h
    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/ikplugin/CMakeLists.txt
    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/IMB_thumbs.h
    branches/particles-2010/source/blender/imbuf/intern/IMB_allocimbuf.h
    branches/particles-2010/source/blender/imbuf/intern/IMB_filter.h
    branches/particles-2010/source/blender/imbuf/intern/allocimbuf.c
    branches/particles-2010/source/blender/imbuf/intern/anim_movie.c
    branches/particles-2010/source/blender/imbuf/intern/cache.c
    branches/particles-2010/source/blender/imbuf/intern/cineon/CMakeLists.txt
    branches/particles-2010/source/blender/imbuf/intern/cineon/logImageCore.c
    branches/particles-2010/source/blender/imbuf/intern/cineon/logImageCore.h
    branches/particles-2010/source/blender/imbuf/intern/dds/CMakeLists.txt
    branches/particles-2010/source/blender/imbuf/intern/divers.c
    branches/particles-2010/source/blender/imbuf/intern/filter.c
    branches/particles-2010/source/blender/imbuf/intern/openexr/CMakeLists.txt
    branches/particles-2010/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/particles-2010/source/blender/imbuf/intern/openexr/openexr_multi.h
    branches/particles-2010/source/blender/imbuf/intern/scaling.c
    branches/particles-2010/source/blender/imbuf/intern/util.c
    branches/particles-2010/source/blender/makesdna/CMakeLists.txt
    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_curve_types.h
    branches/particles-2010/source/blender/makesdna/DNA_genfile.h
    branches/particles-2010/source/blender/makesdna/DNA_lattice_types.h
    branches/particles-2010/source/blender/makesdna/DNA_material_types.h
    branches/particles-2010/source/blender/makesdna/DNA_meta_types.h
    branches/particles-2010/source/blender/makesdna/DNA_modifier_types.h
    branches/particles-2010/source/blender/makesdna/DNA_object_force.h
    branches/particles-2010/source/blender/makesdna/DNA_particle_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_space_types.h
    branches/particles-2010/source/blender/makesdna/DNA_texture_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/dna_genfile.c
    branches/particles-2010/source/blender/makesdna/intern/makesdna.c
    branches/particles-2010/source/blender/makesrna/CMakeLists.txt
    branches/particles-2010/source/blender/makesrna/RNA_access.h
    branches/particles-2010/source/blender/makesrna/RNA_enum_types.h
    branches/particles-2010/source/blender/makesrna/RNA_types.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_boid.c
    branches/particles-2010/source/blender/makesrna/intern/rna_brush.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_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.c
    branches/particles-2010/source/blender/makesrna/intern/rna_internal.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_material.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_nodetree_types.h
    branches/particles-2010/source/blender/makesrna/intern/rna_object.c
    branches/particles-2010/source/blender/makesrna/intern/rna_object_api.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_render.c
    branches/particles-2010/source/blender/makesrna/intern/rna_scene.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_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_ui.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_properties.txt
    branches/particles-2010/source/blender/modifiers/CMakeLists.txt
    branches/particles-2010/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_displace.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_smoke.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_util.h
    branches/particles-2010/source/blender/nodes/CMakeLists.txt
    branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
    branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
    branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
    branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_math.c
    branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
    branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
    branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_get_mesh_data.c
    branches/particles-2010/source/blender/nodes/intern/SIM_util.c
    branches/particles-2010/source/blender/nodes/intern/SIM_util.h
    branches/particles-2010/source/blender/nodes/intern/TEX_util.c
    branches/particles-2010/source/blender/nodes/intern/node_util.c
    branches/particles-2010/source/blender/python/BPY_extern.h
    branches/particles-2010/source/blender/python/CMakeLists.txt
    branches/particles-2010/source/blender/python/generic/CMakeLists.txt
    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/mathutils_color.c
    branches/particles-2010/source/blender/python/generic/mathutils_euler.c
    branches/particles-2010/source/blender/python/generic/mathutils_geometry.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/generic/noise.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/CMakeLists.txt
    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_driver.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_rna.c
    branches/particles-2010/source/blender/python/intern/bpy_util.c
    branches/particles-2010/source/blender/python/intern/stubs.c
    branches/particles-2010/source/blender/quicktime/CMakeLists.txt
    branches/particles-2010/source/blender/quicktime/apple/qtkit_export.m
    branches/particles-2010/source/blender/quicktime/quicktime_export.h
    branches/particles-2010/source/blender/readblenfile/BLO_readblenfile.h
    branches/particles-2010/source/blender/readblenfile/CMakeLists.txt
    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_pipeline.h
    branches/particles-2010/source/blender/render/extern/include/RE_raytrace.h
    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/source/convertblender.c
    branches/particles-2010/source/blender/render/intern/source/imagetexture.c
    branches/particles-2010/source/blender/render/intern/source/pipeline.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/volumetric.c
    branches/particles-2010/source/blender/render/intern/source/voxeldata.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_cursors.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_keymap.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/blenderplayer/CMakeLists.txt
    branches/particles-2010/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
    branches/particles-2010/source/creator/CMakeLists.txt
    branches/particles-2010/source/gameengine/BlenderRoutines/CMakeLists.txt
    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_BlenderRenderTools.cpp
    branches/particles-2010/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/particles-2010/source/gameengine/CMakeLists.txt
    branches/particles-2010/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/particles-2010/source/gameengine/Converter/CMakeLists.txt
    branches/particles-2010/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/particles-2010/source/gameengine/Expressions/CMakeLists.txt
    branches/particles-2010/source/gameengine/GameLogic/CMakeLists.txt
    branches/particles-2010/source/gameengine/GamePlayer/CMakeLists.txt
    branches/particles-2010/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/particles-2010/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/particles-2010/source/gameengine/GamePlayer/common/GPC_RenderTools.h
    branches/particles-2010/source/gameengine/GamePlayer/common/Makefile
    branches/particles-2010/source/gameengine/GamePlayer/common/SConscript
    branches/particles-2010/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/particles-2010/source/gameengine/GamePlayer/xembed/CMakeLists.txt
    branches/particles-2010/source/gameengine/Ketsji/CMakeLists.txt
    branches/particles-2010/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
    branches/particles-2010/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_IpoActuator.h
    branches/particles-2010/source/gameengine/Ketsji/KX_KetsjiEngine.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_PyMath.h
    branches/particles-2010/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_Scene.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_Scene.h
    branches/particles-2010/source/gameengine/Ketsji/Makefile
    branches/particles-2010/source/gameengine/Ketsji/SConscript
    branches/particles-2010/source/gameengine/Network/CMakeLists.txt
    branches/particles-2010/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
    branches/particles-2010/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/particles-2010/source/gameengine/Physics/Dummy/CMakeLists.txt
    branches/particles-2010/source/gameengine/Physics/common/CMakeLists.txt
    branches/particles-2010/source/gameengine/Rasterizer/CMakeLists.txt
    branches/particles-2010/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/particles-2010/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/particles-2010/source/gameengine/SceneGraph/CMakeLists.txt
    branches/particles-2010/source/gameengine/VideoTexture/CMakeLists.txt
    branches/particles-2010/source/gameengine/VideoTexture/FilterBlueScreen.h
    branches/particles-2010/source/gameengine/VideoTexture/ImageRender.cpp
    branches/particles-2010/source/gameengine/VideoTexture/ImageRender.h
    branches/particles-2010/source/kernel/CMakeLists.txt

Added Paths:
-----------
    branches/particles-2010/build_files/cmake/cmake_qtcreator_project.py
    branches/particles-2010/intern/tools/bpy_introspect_ui.py
    branches/particles-2010/intern/tools/dump_rna2xml.py
    branches/particles-2010/release/datafiles/ctodata.py
    branches/particles-2010/release/scripts/templates/background_job.py
    branches/particles-2010/source/blender/python/generic/blf_py_api.c
    branches/particles-2010/source/blender/python/generic/blf_py_api.h
    branches/particles-2010/source/gameengine/Ketsji/KX_FontObject.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_FontObject.h

Removed Paths:
-------------
    branches/particles-2010/release/scripts/modules/extensions_framework/
    branches/particles-2010/source/blender/blenfont/BLF_types.h
    branches/particles-2010/source/blender/python/generic/blf_api.c
    branches/particles-2010/source/blender/python/generic/blf_api.h

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

Modified: branches/particles-2010/CMakeLists.txt
===================================================================
--- branches/particles-2010/CMakeLists.txt	2010-12-17 16:05:40 UTC (rev 33746)
+++ branches/particles-2010/CMakeLists.txt	2010-12-17 16:21:31 UTC (rev 33747)
@@ -30,8 +30,8 @@
 # build the libs and objects in it. It will also conflict with the current 
 # Makefile system for Blender
 
-IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-MESSAGE(FATAL_ERROR "CMake generation for blender is not allowed within the source directory! 
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+message(FATAL_ERROR "CMake generation for blender is not allowed within the source directory! 
 Remove the CMakeCache.txt file and try again from another folder, e.g.: 
 
 	rm CMakeCache.txt 
@@ -40,121 +40,127 @@
 	cd cmake-make
 	cmake -G \"Unix Makefiles\" ../blender
 ")
-ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+endif()
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+cmake_minimum_required(VERSION 2.6)
 
 # quiet output for Makefiles, 'make -s' helps too
-# SET_PROPERTY(GLOBAL PROPERTY RULE_MESSAGES OFF)
+# set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
 
-PROJECT(Blender)
+project(Blender)
 
 #-----------------------------------------------------------------------------
 # Redirect output files
 
-SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
-SET(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/lib)
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE )
+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE )
 
 #-----------------------------------------------------------------------------
 # Load some macros.
-INCLUDE(build_files/cmake/macros.cmake)
+include(build_files/cmake/macros.cmake)
 
 #-----------------------------------------------------------------------------
 # Set default config options
 
-GET_BLENDER_VERSION()
+get_blender_version()
 
 # Blender internal features
-OPTION(WITH_INTERNATIONAL "Enable I18N   (International fonts and text)" ON)
-OPTION(WITH_PYTHON        "Enable Embedded Python API" ON)
-OPTION(WITH_BUILDINFO     "Include extra build details" 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)
-OPTION(WITH_GAMEENGINE    "Enable Game Engine" ON)
-OPTION(WITH_PLAYER        "Build Player" OFF)
+option(WITH_INTERNATIONAL "Enable I18N   (International fonts and text)" ON)
+option(WITH_PYTHON        "Enable Embedded Python API" ON)
+option(WITH_BUILDINFO     "Include extra build details" 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)
+option(WITH_GAMEENGINE    "Enable Game Engine" ON)
+option(WITH_PLAYER        "Build Player" OFF)
 # (unix defaults to OpenMP On)
-IF(UNIX AND NOT APPLE)
-	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
-ELSE()
-	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" OFF)
-ENDIF()
+if(UNIX AND NOT APPLE)
+	option(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
+else()
+	option(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" OFF)
+endif()
 
 # Modifiers
-OPTION(WITH_MOD_FLUID        	"Enable Elbeem Modifier (Fluid Simulation)" ON)
-OPTION(WITH_MOD_DECIMATE       	"Enable Decimate Modifier" ON)
-OPTION(WITH_MOD_BOOLEAN        	"Enable Boolean Modifier" ON)
+option(WITH_MOD_FLUID        	"Enable Elbeem Modifier (Fluid Simulation)" ON)
+option(WITH_MOD_DECIMATE       	"Enable Decimate Modifier" ON)
+option(WITH_MOD_BOOLEAN        	"Enable Boolean Modifier" ON)
 
 # Image format support
-OPTION(WITH_IMAGE_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
-OPTION(WITH_IMAGE_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org)" ON)
-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)
-OPTION(WITH_IMAGE_REDCODE       "Enable RedCode Image Support" OFF)
+option(WITH_IMAGE_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
+option(WITH_IMAGE_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org)" ON)
+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)
+option(WITH_IMAGE_REDCODE       "Enable RedCode Image Support" OFF)
 
 # Audio/Video format support
-OPTION(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu)" OFF)
-OPTION(WITH_CODEC_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
-IF(APPLE OR (WIN32 AND NOT UNIX))
-	OPTION(WITH_CODEC_QUICKTIME     "Enable Quicktime Support" OFF)
-ENDIF(APPLE OR (WIN32 AND NOT UNIX))
+option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu)" OFF)
+option(WITH_CODEC_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
+if(APPLE OR (WIN32 AND NOT UNIX))
+	option(WITH_CODEC_QUICKTIME     "Enable Quicktime Support" OFF)
+endif()
 
 # 3D format support
 # disable opencollada on non-apple unix because opencollada has no package for debian
-IF(UNIX AND NOT APPLE)
-	OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org)"	OFF)
-ELSE()
-	OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org)"	OFF)
-ENDIF()
+if(UNIX AND NOT APPLE)
+	option(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org)"	OFF)
+else()
+	option(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org)"	OFF)
+endif()
 
 # Sound output
-OPTION(WITH_SDL           "Enable SDL for sound and joystick support" ON)
-OPTION(WITH_OPENAL        "Enable OpenAL Support (http://www.openal.org)" ON)
-OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
-OPTION(WITH_SAMPLERATE    "Enable samplerate conversion" ON)
+option(WITH_SDL           "Enable SDL for sound and joystick support" ON)
+option(WITH_OPENAL        "Enable OpenAL Support (http://www.openal.org)" ON)
+option(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
+option(WITH_SAMPLERATE    "Enable samplerate conversion" ON)
 
 # Compression
-OPTION(WITH_LZO           "Enable fast LZO compression (used for pointcache)" ON)
-OPTION(WITH_LZMA          "Enable best LZMA compression, (used for pointcache)" ON)
+option(WITH_LZO           "Enable fast LZO compression (used for pointcache)" ON)
+option(WITH_LZMA          "Enable best LZMA compression, (used for pointcache)" ON)
 
 # Misc
-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)
+option(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON) 
+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)
-	OPTION(USE_QTKIT	  "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
-	OPTION(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)
-ENDIF(APPLE)
+# Debug
+option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
+mark_as_advanced(WITH_CXX_GUARDEDALLOC)
 
+option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BKE_assert()" OFF)
+mark_as_advanced(WITH_ASSERT_ABORT)
+
+if(APPLE)
+	option(WITH_COCOA	  "Use Cocoa framework instead of deprecated Carbon" ON)
+	option(USE_QTKIT	  "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
+	option(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)
+endif()
+
 # only for developers who want to make this functional
-# OPTION(WITH_LCMS          "Enable color correction with lcms" OFF)
+# option(WITH_LCMS          "Enable color correction with lcms" OFF)
 
-IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
-	MESSAGE(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
-ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
+if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
+	message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
+endif()
 
-IF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
-	MESSAGE("WARNING: WITH_PYTHON_INSTALL requires WITH_INSTALL")
-ENDIF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
+if(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
+	message("WARNING: WITH_PYTHON_INSTALL requires WITH_INSTALL")
+endif()
 
-IF(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
-	MESSAGE(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK require WITH_SAMPLERATE")
-ENDIF(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
+if(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
+	message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK require WITH_SAMPLERATE")
+endif()
 
-IF(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
-	MESSAGE(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG")
-ENDIF(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
+if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
+	message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG")
+endif()
 
 TEST_SSE_SUPPORT()
 
 # disabled for now, not supported
-# OPTION(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
+# option(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
 

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list