[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48568] branches/smoke2: Merge from trunk r47744-r48564

Daniel Genrich daniel.genrich at gmx.net
Wed Jul 4 00:34:51 CEST 2012


Revision: 48568
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48568
Author:   genscher
Date:     2012-07-03 22:34:49 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Merge from trunk r47744-r48564 

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47744
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48564

Modified Paths:
--------------
    branches/smoke2/CMakeLists.txt
    branches/smoke2/SConstruct
    branches/smoke2/build_files/cmake/config/blender_lite.cmake
    branches/smoke2/build_files/cmake/macros.cmake
    branches/smoke2/build_files/scons/config/win32-mingw-config.py
    branches/smoke2/build_files/scons/config/win32-vc-config.py
    branches/smoke2/build_files/scons/config/win64-mingw-config.py
    branches/smoke2/build_files/scons/config/win64-vc-config.py
    branches/smoke2/build_files/scons/tools/btools.py
    branches/smoke2/doc/python_api/examples/bpy.ops.1.py
    branches/smoke2/doc/python_api/examples/bpy.ops.2.py
    branches/smoke2/doc/python_api/examples/bpy.ops.3.py
    branches/smoke2/doc/python_api/examples/bpy.ops.py
    branches/smoke2/doc/python_api/examples/bpy.types.Mesh.py
    branches/smoke2/doc/python_api/examples/bpy.types.Object.py
    branches/smoke2/doc/python_api/examples/bpy.types.Panel.1.py
    branches/smoke2/doc/python_api/rst/bge.types.rst
    branches/smoke2/extern/CMakeLists.txt
    branches/smoke2/extern/libmv/libmv/tracking/track_region.cc
    branches/smoke2/extern/libmv/libmv/tracking/track_region.h
    branches/smoke2/extern/libmv/libmv-capi.cpp
    branches/smoke2/extern/libmv/libmv-capi.h
    branches/smoke2/extern/libmv/third_party/ceres/CMakeLists.txt
    branches/smoke2/extern/libmv/third_party/ceres/SConscript
    branches/smoke2/extern/libmv/third_party/ceres/bundle.sh
    branches/smoke2/extern/libopenjpeg/CMakeLists.txt
    branches/smoke2/extern/libopenjpeg/cio.c
    branches/smoke2/extern/libopenjpeg/cio.h
    branches/smoke2/extern/libopenjpeg/dwt.c
    branches/smoke2/extern/libopenjpeg/event.c
    branches/smoke2/extern/libopenjpeg/event.h
    branches/smoke2/extern/libopenjpeg/image.c
    branches/smoke2/extern/libopenjpeg/image.h
    branches/smoke2/extern/libopenjpeg/j2k.c
    branches/smoke2/extern/libopenjpeg/j2k.h
    branches/smoke2/extern/libopenjpeg/j2k_lib.c
    branches/smoke2/extern/libopenjpeg/j2k_lib.h
    branches/smoke2/extern/libopenjpeg/jp2.c
    branches/smoke2/extern/libopenjpeg/jp2.h
    branches/smoke2/extern/libopenjpeg/mct.c
    branches/smoke2/extern/libopenjpeg/mqc.c
    branches/smoke2/extern/libopenjpeg/mqc.h
    branches/smoke2/extern/libopenjpeg/openjpeg.c
    branches/smoke2/extern/libopenjpeg/openjpeg.h
    branches/smoke2/extern/libopenjpeg/opj_includes.h
    branches/smoke2/extern/libopenjpeg/opj_malloc.h
    branches/smoke2/extern/libopenjpeg/pi.c
    branches/smoke2/extern/libopenjpeg/pi.h
    branches/smoke2/extern/libopenjpeg/t1.c
    branches/smoke2/extern/libopenjpeg/t1.h
    branches/smoke2/extern/libopenjpeg/t2.c
    branches/smoke2/extern/libopenjpeg/t2.h
    branches/smoke2/extern/libopenjpeg/tcd.c
    branches/smoke2/extern/libopenjpeg/tcd.h
    branches/smoke2/extern/recastnavigation/Recast/Include/RecastAssert.h
    branches/smoke2/extern/recastnavigation/recast-capi.cpp
    branches/smoke2/intern/audaspace/Python/AUD_PyAPI.cpp
    branches/smoke2/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/smoke2/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
    branches/smoke2/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
    branches/smoke2/intern/bsp/test/BSP_GhostTest/main.cpp
    branches/smoke2/intern/bsp/test/BSP_GhostTest/plyfile.c
    branches/smoke2/intern/container/CTR_UHeap.h
    branches/smoke2/intern/cycles/SConscript
    branches/smoke2/intern/cycles/app/cycles_xml.cpp
    branches/smoke2/intern/cycles/blender/addon/properties.py
    branches/smoke2/intern/cycles/blender/addon/ui.py
    branches/smoke2/intern/cycles/blender/blender_camera.cpp
    branches/smoke2/intern/cycles/blender/blender_object.cpp
    branches/smoke2/intern/cycles/blender/blender_session.cpp
    branches/smoke2/intern/cycles/blender/blender_shader.cpp
    branches/smoke2/intern/cycles/blender/blender_sync.cpp
    branches/smoke2/intern/cycles/blender/blender_util.h
    branches/smoke2/intern/cycles/cmake/external_libs.cmake
    branches/smoke2/intern/cycles/kernel/kernel_emission.h
    branches/smoke2/intern/cycles/kernel/kernel_light.h
    branches/smoke2/intern/cycles/kernel/kernel_path.h
    branches/smoke2/intern/cycles/kernel/kernel_shader.h
    branches/smoke2/intern/cycles/kernel/kernel_triangle.h
    branches/smoke2/intern/cycles/kernel/kernel_types.h
    branches/smoke2/intern/cycles/render/film.cpp
    branches/smoke2/intern/cycles/render/film.h
    branches/smoke2/intern/cycles/render/integrator.cpp
    branches/smoke2/intern/cycles/render/integrator.h
    branches/smoke2/intern/cycles/render/light.cpp
    branches/smoke2/intern/cycles/render/light.h
    branches/smoke2/intern/cycles/render/object.cpp
    branches/smoke2/intern/cycles/render/scene.cpp
    branches/smoke2/intern/elbeem/intern/controlparticles.cpp
    branches/smoke2/intern/ffmpeg/ffmpeg_compat.h
    branches/smoke2/intern/ghost/CMakeLists.txt
    branches/smoke2/intern/ghost/GHOST_C-api.h
    branches/smoke2/intern/ghost/GHOST_IEvent.h
    branches/smoke2/intern/ghost/GHOST_IEventConsumer.h
    branches/smoke2/intern/ghost/GHOST_ISystem.h
    branches/smoke2/intern/ghost/GHOST_ISystemPaths.h
    branches/smoke2/intern/ghost/GHOST_ITimerTask.h
    branches/smoke2/intern/ghost/GHOST_IWindow.h
    branches/smoke2/intern/ghost/GHOST_Rect.h
    branches/smoke2/intern/ghost/GHOST_Types.h
    branches/smoke2/intern/ghost/intern/GHOST_C-api.cpp
    branches/smoke2/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
    branches/smoke2/intern/ghost/intern/GHOST_CallbackEventConsumer.h
    branches/smoke2/intern/ghost/intern/GHOST_DisplayManager.h
    branches/smoke2/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
    branches/smoke2/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
    branches/smoke2/intern/ghost/intern/GHOST_DropTargetWin32.cpp
    branches/smoke2/intern/ghost/intern/GHOST_EventManager.cpp
    branches/smoke2/intern/ghost/intern/GHOST_EventManager.h
    branches/smoke2/intern/ghost/intern/GHOST_ISystem.cpp
    branches/smoke2/intern/ghost/intern/GHOST_ISystemPaths.cpp
    branches/smoke2/intern/ghost/intern/GHOST_ModifierKeys.cpp
    branches/smoke2/intern/ghost/intern/GHOST_System.h
    branches/smoke2/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/smoke2/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/smoke2/intern/ghost/intern/GHOST_SystemPaths.h
    branches/smoke2/intern/ghost/intern/GHOST_SystemPathsX11.cpp
    branches/smoke2/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/smoke2/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/smoke2/intern/ghost/intern/GHOST_TimerManager.cpp
    branches/smoke2/intern/ghost/intern/GHOST_TimerManager.h
    branches/smoke2/intern/ghost/intern/GHOST_WindowCarbon.cpp
    branches/smoke2/intern/ghost/intern/GHOST_WindowManager.cpp
    branches/smoke2/intern/ghost/intern/GHOST_WindowManager.h
    branches/smoke2/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/smoke2/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/smoke2/intern/ghost/test/gears/GHOST_C-Test.c
    branches/smoke2/intern/ghost/test/gears/GHOST_Test.cpp
    branches/smoke2/intern/guardedalloc/MEM_guardedalloc.h
    branches/smoke2/intern/guardedalloc/cpp/mallocn.cpp
    branches/smoke2/intern/guardedalloc/intern/mallocn.c
    branches/smoke2/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
    branches/smoke2/intern/raskter/raskter.c
    branches/smoke2/intern/raskter/raskter.h
    branches/smoke2/intern/smoke/intern/MERSENNETWISTER.h
    branches/smoke2/intern/smoke/intern/smoke_API.cpp
    branches/smoke2/intern/string/STR_String.h
    branches/smoke2/intern/string/intern/STR_String.cpp
    branches/smoke2/intern/utfconv/utf_winfunc.c
    branches/smoke2/release/datafiles/clkernelstoh.py
    branches/smoke2/release/scripts/modules/addon_utils.py
    branches/smoke2/release/scripts/modules/animsys_refactor.py
    branches/smoke2/release/scripts/modules/blend_render_info.py
    branches/smoke2/release/scripts/modules/bpy/__init__.py
    branches/smoke2/release/scripts/modules/bpy/ops.py
    branches/smoke2/release/scripts/modules/bpy/utils.py
    branches/smoke2/release/scripts/modules/bpy_extras/image_utils.py
    branches/smoke2/release/scripts/modules/bpy_extras/io_utils.py
    branches/smoke2/release/scripts/modules/bpy_extras/keyconfig_utils.py
    branches/smoke2/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/smoke2/release/scripts/modules/bpy_extras/view3d_utils.py
    branches/smoke2/release/scripts/modules/bpyml_ui.py
    branches/smoke2/release/scripts/modules/console_python.py
    branches/smoke2/release/scripts/modules/console_shell.py
    branches/smoke2/release/scripts/modules/graphviz_export.py
    branches/smoke2/release/scripts/modules/rna_info.py
    branches/smoke2/release/scripts/modules/rna_xml.py
    branches/smoke2/release/scripts/modules/sys_info.py
    branches/smoke2/release/scripts/presets/interface_theme/back_to_black.xml
    branches/smoke2/release/scripts/presets/interface_theme/blender_24x.xml
    branches/smoke2/release/scripts/presets/interface_theme/elsyiun.xml
    branches/smoke2/release/scripts/presets/interface_theme/hexagon.xml
    branches/smoke2/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
    branches/smoke2/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/smoke2/release/scripts/startup/bl_operators/anim.py
    branches/smoke2/release/scripts/startup/bl_operators/console.py
    branches/smoke2/release/scripts/startup/bl_operators/image.py
    branches/smoke2/release/scripts/startup/bl_operators/mesh.py
    branches/smoke2/release/scripts/startup/bl_operators/object.py
    branches/smoke2/release/scripts/startup/bl_operators/object_align.py
    branches/smoke2/release/scripts/startup/bl_operators/object_quick_effects.py
    branches/smoke2/release/scripts/startup/bl_operators/object_randomize_transform.py
    branches/smoke2/release/scripts/startup/bl_operators/presets.py
    branches/smoke2/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
    branches/smoke2/release/scripts/startup/bl_operators/sequencer.py
    branches/smoke2/release/scripts/startup/bl_operators/uvcalc_follow_active.py
    branches/smoke2/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/smoke2/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/smoke2/release/scripts/startup/bl_operators/wm.py
    branches/smoke2/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/smoke2/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/smoke2/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/smoke2/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/smoke2/release/scripts/startup/bl_ui/properties_game.py
    branches/smoke2/release/scripts/startup/bl_ui/properties_object.py
    branches/smoke2/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/smoke2/release/scripts/startup/bl_ui/properties_particle.py
    branches/smoke2/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/smoke2/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/smoke2/release/scripts/startup/bl_ui/properties_render.py
    branches/smoke2/release/scripts/startup/bl_ui/properties_scene.py
    branches/smoke2/release/scripts/startup/bl_ui/properties_texture.py
    branches/smoke2/release/scripts/startup/bl_ui/space_clip.py
    branches/smoke2/release/scripts/startup/bl_ui/space_info.py
    branches/smoke2/release/scripts/startup/bl_ui/space_node.py
    branches/smoke2/release/scripts/startup/bl_ui/space_sequencer.py
    branches/smoke2/release/scripts/startup/bl_ui/space_userpref.py
    branches/smoke2/release/scripts/startup/bl_ui/space_view3d.py
    branches/smoke2/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/smoke2/release/scripts/templates/operator_file_export.py
    branches/smoke2/release/scripts/templates/operator_file_import.py
    branches/smoke2/release/scripts/templates/operator_mesh_add.py
    branches/smoke2/release/scripts/templates/operator_modal.py
    branches/smoke2/release/scripts/templates/operator_modal_draw.py
    branches/smoke2/release/scripts/templates/operator_modal_timer.py
    branches/smoke2/release/scripts/templates/operator_modal_view3d.py
    branches/smoke2/release/scripts/templates/operator_node.py
    branches/smoke2/release/scripts/templates/operator_simple.py
    branches/smoke2/release/scripts/templates/operator_uv.py
    branches/smoke2/source/SConscript
    branches/smoke2/source/blender/CMakeLists.txt
    branches/smoke2/source/blender/SConscript
    branches/smoke2/source/blender/avi/intern/avi.c
    branches/smoke2/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/smoke2/source/blender/blenkernel/BKE_action.h
    branches/smoke2/source/blender/blenkernel/BKE_anim.h
    branches/smoke2/source/blender/blenkernel/BKE_blender.h
    branches/smoke2/source/blender/blenkernel/BKE_colortools.h
    branches/smoke2/source/blender/blenkernel/BKE_global.h
    branches/smoke2/source/blender/blenkernel/BKE_image.h
    branches/smoke2/source/blender/blenkernel/BKE_mask.h
    branches/smoke2/source/blender/blenkernel/BKE_material.h
    branches/smoke2/source/blender/blenkernel/BKE_mesh.h
    branches/smoke2/source/blender/blenkernel/BKE_movieclip.h
    branches/smoke2/source/blender/blenkernel/BKE_multires.h
    branches/smoke2/source/blender/blenkernel/BKE_node.h
    branches/smoke2/source/blender/blenkernel/BKE_object.h
    branches/smoke2/source/blender/blenkernel/BKE_shrinkwrap.h
    branches/smoke2/source/blender/blenkernel/BKE_tracking.h
    branches/smoke2/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/smoke2/source/blender/blenkernel/intern/action.c
    branches/smoke2/source/blender/blenkernel/intern/anim.c
    branches/smoke2/source/blender/blenkernel/intern/anim_sys.c
    branches/smoke2/source/blender/blenkernel/intern/armature.c
    branches/smoke2/source/blender/blenkernel/intern/boids.c
    branches/smoke2/source/blender/blenkernel/intern/cloth.c
    branches/smoke2/source/blender/blenkernel/intern/collision.c
    branches/smoke2/source/blender/blenkernel/intern/colortools.c
    branches/smoke2/source/blender/blenkernel/intern/constraint.c
    branches/smoke2/source/blender/blenkernel/intern/curve.c
    branches/smoke2/source/blender/blenkernel/intern/depsgraph.c
    branches/smoke2/source/blender/blenkernel/intern/dynamicpaint.c
    branches/smoke2/source/blender/blenkernel/intern/effect.c
    branches/smoke2/source/blender/blenkernel/intern/fcurve.c
    branches/smoke2/source/blender/blenkernel/intern/fmodifier.c
    branches/smoke2/source/blender/blenkernel/intern/image.c
    branches/smoke2/source/blender/blenkernel/intern/implicit.c
    branches/smoke2/source/blender/blenkernel/intern/ipo.c
    branches/smoke2/source/blender/blenkernel/intern/key.c
    branches/smoke2/source/blender/blenkernel/intern/lattice.c
    branches/smoke2/source/blender/blenkernel/intern/library.c
    branches/smoke2/source/blender/blenkernel/intern/mask.c
    branches/smoke2/source/blender/blenkernel/intern/material.c
    branches/smoke2/source/blender/blenkernel/intern/mesh.c
    branches/smoke2/source/blender/blenkernel/intern/mesh_validate.c
    branches/smoke2/source/blender/blenkernel/intern/modifiers_bmesh.c
    branches/smoke2/source/blender/blenkernel/intern/movieclip.c
    branches/smoke2/source/blender/blenkernel/intern/multires.c
    branches/smoke2/source/blender/blenkernel/intern/node.c
    branches/smoke2/source/blender/blenkernel/intern/object.c
    branches/smoke2/source/blender/blenkernel/intern/ocean.c
    branches/smoke2/source/blender/blenkernel/intern/paint.c
    branches/smoke2/source/blender/blenkernel/intern/particle.c
    branches/smoke2/source/blender/blenkernel/intern/particle_system.c
    branches/smoke2/source/blender/blenkernel/intern/pointcache.c
    branches/smoke2/source/blender/blenkernel/intern/sequencer.c
    branches/smoke2/source/blender/blenkernel/intern/smoke.c
    branches/smoke2/source/blender/blenkernel/intern/tracking.c
    branches/smoke2/source/blender/blenkernel/intern/unit.c
    branches/smoke2/source/blender/blenkernel/intern/writeffmpeg.c
    branches/smoke2/source/blender/blenlib/BLI_array.h
    branches/smoke2/source/blender/blenlib/BLI_fileops.h
    branches/smoke2/source/blender/blenlib/BLI_math_color.h
    branches/smoke2/source/blender/blenlib/BLI_math_vector.h
    branches/smoke2/source/blender/blenlib/BLI_path_util.h
    branches/smoke2/source/blender/blenlib/CMakeLists.txt
    branches/smoke2/source/blender/blenlib/intern/BLI_kdtree.c
    branches/smoke2/source/blender/blenlib/intern/boxpack2d.c
    branches/smoke2/source/blender/blenlib/intern/fileops.c
    branches/smoke2/source/blender/blenlib/intern/fnmatch.c
    branches/smoke2/source/blender/blenlib/intern/freetypefont.c
    branches/smoke2/source/blender/blenlib/intern/math_color.c
    branches/smoke2/source/blender/blenlib/intern/math_color_inline.c
    branches/smoke2/source/blender/blenlib/intern/math_geom.c
    branches/smoke2/source/blender/blenlib/intern/math_vector.c
    branches/smoke2/source/blender/blenlib/intern/math_vector_inline.c
    branches/smoke2/source/blender/blenlib/intern/path_util.c
    branches/smoke2/source/blender/blenlib/intern/scanfill.c
    branches/smoke2/source/blender/blenlib/intern/storage.c
    branches/smoke2/source/blender/blenlib/intern/string_utf8.c
    branches/smoke2/source/blender/blenlib/intern/threads.c
    branches/smoke2/source/blender/blenlib/intern/time.c
    branches/smoke2/source/blender/blenlib/intern/voxel.c
    branches/smoke2/source/blender/blenloader/intern/readfile.c
    branches/smoke2/source/blender/blenloader/intern/versioning_250.c
    branches/smoke2/source/blender/blenloader/intern/writefile.c
    branches/smoke2/source/blender/bmesh/CMakeLists.txt
    branches/smoke2/source/blender/bmesh/intern/bmesh_core.c
    branches/smoke2/source/blender/bmesh/intern/bmesh_mesh.c
    branches/smoke2/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/smoke2/source/blender/bmesh/intern/bmesh_mods.c
    branches/smoke2/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/smoke2/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/smoke2/source/blender/bmesh/intern/bmesh_operator_api_inline.h
    branches/smoke2/source/blender/bmesh/intern/bmesh_operators.c
    branches/smoke2/source/blender/bmesh/intern/bmesh_operators.h
    branches/smoke2/source/blender/bmesh/intern/bmesh_operators_private.h
    branches/smoke2/source/blender/bmesh/intern/bmesh_polygon.c
    branches/smoke2/source/blender/bmesh/intern/bmesh_queries.c
    branches/smoke2/source/blender/bmesh/intern/bmesh_queries.h
    branches/smoke2/source/blender/bmesh/intern/bmesh_walkers_impl.c
    branches/smoke2/source/blender/bmesh/operators/bmo_bevel.c
    branches/smoke2/source/blender/bmesh/operators/bmo_connect.c
    branches/smoke2/source/blender/bmesh/operators/bmo_dissolve.c
    branches/smoke2/source/blender/bmesh/operators/bmo_dupe.c
    branches/smoke2/source/blender/bmesh/operators/bmo_edgesplit.c
    branches/smoke2/source/blender/bmesh/operators/bmo_extrude.c
    branches/smoke2/source/blender/bmesh/operators/bmo_hull.c
    branches/smoke2/source/blender/bmesh/operators/bmo_mirror.c
    branches/smoke2/source/blender/bmesh/operators/bmo_primitive.c
    branches/smoke2/source/blender/bmesh/operators/bmo_removedoubles.c
    branches/smoke2/source/blender/bmesh/operators/bmo_slide.c
    branches/smoke2/source/blender/bmesh/operators/bmo_subdivide.c
    branches/smoke2/source/blender/bmesh/operators/bmo_utils.c
    branches/smoke2/source/blender/collada/AnimationExporter.cpp
    branches/smoke2/source/blender/collada/AnimationImporter.cpp
    branches/smoke2/source/blender/collada/AnimationImporter.h
    branches/smoke2/source/blender/collada/ArmatureExporter.cpp
    branches/smoke2/source/blender/collada/ArmatureExporter.h
    branches/smoke2/source/blender/collada/ArmatureImporter.cpp
    branches/smoke2/source/blender/collada/CMakeLists.txt
    branches/smoke2/source/blender/collada/CameraExporter.cpp
    branches/smoke2/source/blender/collada/CameraExporter.h
    branches/smoke2/source/blender/collada/DocumentExporter.cpp
    branches/smoke2/source/blender/collada/DocumentExporter.h
    branches/smoke2/source/blender/collada/DocumentImporter.cpp
    branches/smoke2/source/blender/collada/EffectExporter.cpp
    branches/smoke2/source/blender/collada/EffectExporter.h
    branches/smoke2/source/blender/collada/ErrorHandler.cpp
    branches/smoke2/source/blender/collada/ExportSettings.h
    branches/smoke2/source/blender/collada/ExtraHandler.cpp
    branches/smoke2/source/blender/collada/ExtraTags.cpp
    branches/smoke2/source/blender/collada/GeometryExporter.cpp
    branches/smoke2/source/blender/collada/GeometryExporter.h
    branches/smoke2/source/blender/collada/ImageExporter.cpp
    branches/smoke2/source/blender/collada/ImageExporter.h
    branches/smoke2/source/blender/collada/InstanceWriter.cpp
    branches/smoke2/source/blender/collada/InstanceWriter.h
    branches/smoke2/source/blender/collada/LightExporter.cpp
    branches/smoke2/source/blender/collada/MaterialExporter.cpp
    branches/smoke2/source/blender/collada/MaterialExporter.h
    branches/smoke2/source/blender/collada/MeshImporter.cpp
    branches/smoke2/source/blender/collada/SConscript
    branches/smoke2/source/blender/collada/SceneExporter.cpp
    branches/smoke2/source/blender/collada/SkinInfo.cpp
    branches/smoke2/source/blender/collada/TransformReader.cpp
    branches/smoke2/source/blender/collada/TransformWriter.cpp
    branches/smoke2/source/blender/collada/collada.cpp
    branches/smoke2/source/blender/collada/collada.h
    branches/smoke2/source/blender/collada/collada_internal.cpp
    branches/smoke2/source/blender/collada/collada_internal.h
    branches/smoke2/source/blender/collada/collada_utils.cpp
    branches/smoke2/source/blender/collada/collada_utils.h
    branches/smoke2/source/blender/compositor/CMakeLists.txt
    branches/smoke2/source/blender/compositor/COM_compositor.h
    branches/smoke2/source/blender/compositor/COM_defines.h
    branches/smoke2/source/blender/compositor/intern/COM_CPUDevice.cpp
    branches/smoke2/source/blender/compositor/intern/COM_CPUDevice.h
    branches/smoke2/source/blender/compositor/intern/COM_ChannelInfo.cpp
    branches/smoke2/source/blender/compositor/intern/COM_ChannelInfo.h
    branches/smoke2/source/blender/compositor/intern/COM_ChunkOrder.cpp
    branches/smoke2/source/blender/compositor/intern/COM_ChunkOrder.h
    branches/smoke2/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp
    branches/smoke2/source/blender/compositor/intern/COM_ChunkOrderHotspot.h
    branches/smoke2/source/blender/compositor/intern/COM_CompositorContext.cpp
    branches/smoke2/source/blender/compositor/intern/COM_CompositorContext.h
    branches/smoke2/source/blender/compositor/intern/COM_Converter.cpp
    branches/smoke2/source/blender/compositor/intern/COM_Converter.h
    branches/smoke2/source/blender/compositor/intern/COM_Device.h
    branches/smoke2/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/smoke2/source/blender/compositor/intern/COM_ExecutionGroup.h
    branches/smoke2/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/smoke2/source/blender/compositor/intern/COM_ExecutionSystem.h
    branches/smoke2/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
    branches/smoke2/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
    branches/smoke2/source/blender/compositor/intern/COM_InputSocket.cpp
    branches/smoke2/source/blender/compositor/intern/COM_InputSocket.h
    branches/smoke2/source/blender/compositor/intern/COM_MemoryBuffer.cpp
    branches/smoke2/source/blender/compositor/intern/COM_MemoryBuffer.h
    branches/smoke2/source/blender/compositor/intern/COM_MemoryProxy.cpp
    branches/smoke2/source/blender/compositor/intern/COM_MemoryProxy.h
    branches/smoke2/source/blender/compositor/intern/COM_Node.cpp
    branches/smoke2/source/blender/compositor/intern/COM_Node.h
    branches/smoke2/source/blender/compositor/intern/COM_NodeBase.cpp
    branches/smoke2/source/blender/compositor/intern/COM_NodeBase.h
    branches/smoke2/source/blender/compositor/intern/COM_NodeOperation.cpp
    branches/smoke2/source/blender/compositor/intern/COM_NodeOperation.h
    branches/smoke2/source/blender/compositor/intern/COM_OpenCLDevice.cpp
    branches/smoke2/source/blender/compositor/intern/COM_OpenCLDevice.h
    branches/smoke2/source/blender/compositor/intern/COM_OutputSocket.cpp
    branches/smoke2/source/blender/compositor/intern/COM_OutputSocket.h
    branches/smoke2/source/blender/compositor/intern/COM_Socket.cpp
    branches/smoke2/source/blender/compositor/intern/COM_Socket.h
    branches/smoke2/source/blender/compositor/intern/COM_SocketConnection.cpp
    branches/smoke2/source/blender/compositor/intern/COM_SocketConnection.h
    branches/smoke2/source/blender/compositor/intern/COM_SocketReader.h
    branches/smoke2/source/blender/compositor/intern/COM_WorkPackage.cpp
    branches/smoke2/source/blender/compositor/intern/COM_WorkPackage.h
    branches/smoke2/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/smoke2/source/blender/compositor/intern/COM_WorkScheduler.h
    branches/smoke2/source/blender/compositor/intern/COM_compositor.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_AlphaOverNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_BilateralBlurNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_BlurNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_BlurNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_BokehBlurNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_BokehImageNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_BokehImageNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_BoxMaskNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_BrightnessNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_BrightnessNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_ChannelMatteNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_ChromaMatteNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_ColorBalanceNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_ColorCorrectionNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_ColorCurveNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_ColorMatteNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_ColorNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_ColorNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_ColorRampNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_ColorRampNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_ColorSpillNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_ColorSpillNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_ColorToBWNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_CombineHSVANode.h
    branches/smoke2/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_CombineRGBANode.h
    branches/smoke2/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_CombineYCCANode.h
    branches/smoke2/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_CombineYUVANode.h
    branches/smoke2/source/blender/compositor/nodes/COM_CompositorNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_CompositorNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_ConvertAlphaNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_CropNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_CropNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_DefocusNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_DefocusNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_DilateErodeNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_DirectionalBlurNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_DisplaceNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_DisplaceNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_DistanceMatteNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_EllipseMaskNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_FilterNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_FilterNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_FlipNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_FlipNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_GammaNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_GammaNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_GlareNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_GlareNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_GroupNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_GroupNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_HueSaturationValueNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_IDMaskNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_IDMaskNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_ImageNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_ImageNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_InvertNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_InvertNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_LensDistortionNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_LuminanceMatteNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_MapUVNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_MapUVNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_MapValueNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_MapValueNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_MaskNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_MaskNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_MathNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_MathNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_MixNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_MixNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_MovieClipNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_MovieClipNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_MovieDistortionNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_MuteNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_MuteNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_NormalNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_NormalNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_NormalizeNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_NormalizeNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_OutputFileNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_OutputFileNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_RenderLayersNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_RotateNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_RotateNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_ScaleNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_ScaleNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_SeparateHSVANode.h
    branches/smoke2/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_SeparateRGBANode.h
    branches/smoke2/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_SeparateYCCANode.h
    branches/smoke2/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_SeparateYUVANode.h
    branches/smoke2/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_SetAlphaNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_SocketProxyNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_SplitViewerNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_Stabilize2dNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_SwitchNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_SwitchNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_TextureNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_TextureNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_TimeNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_TimeNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_TonemapNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_TonemapNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_TransformNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_TransformNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_TranslateNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_TranslateNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_ValueNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_ValueNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_VectorBlurNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_VectorCurveNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_ViewLevelsNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_ViewerNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_ViewerNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_ZCombineNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_ZCombineNode.h
    branches/smoke2/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_AntiAliasOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_BilateralBlurOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_BlurBaseOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_BokehBlurOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_BokehImageOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_BokehImageOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_BoxMaskOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_BrightnessOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_BrightnessOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_CalculateMeanOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ChangeHSVOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ChannelMatteOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ChromaMatteOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ColorCurveOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ColorMatteOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ColorRampOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ColorRampOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ColorSpillOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ColorSpillOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_CombineChannelsOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_CompositorOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_CompositorOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvertColourToValueProg.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvertValueToColourProg.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_CropOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_CropOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_CurveBaseOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_CurveBaseOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_DilateErodeOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_DisplaceOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_DisplaceOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_DistanceMatteOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_DotproductOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_DotproductOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_EllipseMaskOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_FlipOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_FlipOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_GammaCorrectOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_GammaOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_GammaOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_GlareBaseOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_GlareGhostOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_GlareSimpleStarOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_GlareStreaksOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_GlareStreaksOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_GlareThresholdOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_IDMaskOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_IDMaskOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ImageOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ImageOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_InvertOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_InvertOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MapUVOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MapUVOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MapValueOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MapValueOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MaskOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MaskOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MathBaseOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MathBaseOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixAddOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixAddOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixBaseOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixBaseOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixBlendOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixBlendOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixBurnOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixBurnOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixColorOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixColorOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixDarkenOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixDifferenceOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixDivideOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixDivideOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixDodgeOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixHueOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixHueOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixLightenOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixLightenOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixLinearLightOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixMultiplyOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixOverlayOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixSaturationOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixScreenOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixScreenOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixSoftLightOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixSubtractOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixValueOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixValueOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MovieClipOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MovieClipOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MovieDistortionOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MultilayerImageOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_NormalizeOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_NormalizeOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_OpenCLKernels.cl
    branches/smoke2/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
    branches/smoke2/source/blender/compositor/operations/COM_OutputFileOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_OutputFileOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_PreviewOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_PreviewOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_QualityStepHelper.cpp
    branches/smoke2/source/blender/compositor/operations/COM_QualityStepHelper.h
    branches/smoke2/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ReadBufferOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersAOOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersColorOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersDepthProg.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersEmitOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersMistOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersMistOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersNormalOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersShadowOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RenderLayersUVOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RotateOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_RotateOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ScaleOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ScaleOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_SeparateChannelOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_SetAlphaOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_SetColorOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_SetColorOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_SetSamplerOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_SetSamplerOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_SetValueOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_SetValueOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_SetVectorOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_SetVectorOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_SocketProxyOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_SplitViewerOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_TextureOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_TextureOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_TonemapOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_TonemapOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_TranslateOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_TranslateOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_VectorBlurOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_VectorCurveOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ViewerBaseOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ViewerOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ViewerOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_WriteBufferOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_ZCombineOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_ZCombineOperation.h
    branches/smoke2/source/blender/editors/CMakeLists.txt
    branches/smoke2/source/blender/editors/SConscript
    branches/smoke2/source/blender/editors/animation/anim_filter.c
    branches/smoke2/source/blender/editors/animation/drivers.c
    branches/smoke2/source/blender/editors/animation/fmodifier_ui.c
    branches/smoke2/source/blender/editors/animation/keyframes_draw.c
    branches/smoke2/source/blender/editors/animation/keyframes_general.c
    branches/smoke2/source/blender/editors/animation/keyframing.c
    branches/smoke2/source/blender/editors/armature/armature_intern.h
    branches/smoke2/source/blender/editors/armature/armature_ops.c
    branches/smoke2/source/blender/editors/armature/editarmature.c
    branches/smoke2/source/blender/editors/armature/meshlaplacian.c
    branches/smoke2/source/blender/editors/armature/poseSlide.c
    branches/smoke2/source/blender/editors/armature/poselib.c
    branches/smoke2/source/blender/editors/curve/editcurve.c
    branches/smoke2/source/blender/editors/gpencil/gpencil_buttons.c
    branches/smoke2/source/blender/editors/gpencil/gpencil_edit.c
    branches/smoke2/source/blender/editors/gpencil/gpencil_paint.c
    branches/smoke2/source/blender/editors/include/ED_anim_api.h
    branches/smoke2/source/blender/editors/include/ED_clip.h
    branches/smoke2/source/blender/editors/include/ED_node.h
    branches/smoke2/source/blender/editors/include/ED_object.h
    branches/smoke2/source/blender/editors/include/ED_sequencer.h
    branches/smoke2/source/blender/editors/include/ED_transform.h
    branches/smoke2/source/blender/editors/include/UI_view2d.h
    branches/smoke2/source/blender/editors/interface/interface.c
    branches/smoke2/source/blender/editors/interface/interface_draw.c
    branches/smoke2/source/blender/editors/interface/interface_handlers.c
    branches/smoke2/source/blender/editors/interface/interface_icons.c
    branches/smoke2/source/blender/editors/interface/interface_intern.h
    branches/smoke2/source/blender/editors/interface/interface_layout.c
    branches/smoke2/source/blender/editors/interface/interface_ops.c
    branches/smoke2/source/blender/editors/interface/interface_regions.c
    branches/smoke2/source/blender/editors/interface/interface_templates.c
    branches/smoke2/source/blender/editors/interface/interface_utils.c
    branches/smoke2/source/blender/editors/interface/interface_widgets.c
    branches/smoke2/source/blender/editors/interface/resources.c
    branches/smoke2/source/blender/editors/interface/view2d.c
    branches/smoke2/source/blender/editors/mask/mask_add.c
    branches/smoke2/source/blender/editors/mask/mask_draw.c
    branches/smoke2/source/blender/editors/mask/mask_edit.c
    branches/smoke2/source/blender/editors/mask/mask_intern.h
    branches/smoke2/source/blender/editors/mask/mask_ops.c
    branches/smoke2/source/blender/editors/mask/mask_relationships.c
    branches/smoke2/source/blender/editors/mask/mask_select.c
    branches/smoke2/source/blender/editors/mask/mask_shapekey.c
    branches/smoke2/source/blender/editors/mesh/editmesh_bvh.c
    branches/smoke2/source/blender/editors/mesh/editmesh_bvh.h
    branches/smoke2/source/blender/editors/mesh/editmesh_knife.c
    branches/smoke2/source/blender/editors/mesh/editmesh_loopcut.c
    branches/smoke2/source/blender/editors/mesh/editmesh_rip.c
    branches/smoke2/source/blender/editors/mesh/editmesh_select.c
    branches/smoke2/source/blender/editors/mesh/editmesh_slide.c
    branches/smoke2/source/blender/editors/mesh/editmesh_tools.c
    branches/smoke2/source/blender/editors/mesh/editmesh_utils.c
    branches/smoke2/source/blender/editors/mesh/meshtools.c
    branches/smoke2/source/blender/editors/object/object_add.c
    branches/smoke2/source/blender/editors/object/object_bake.c
    branches/smoke2/source/blender/editors/object/object_constraint.c
    branches/smoke2/source/blender/editors/object/object_edit.c
    branches/smoke2/source/blender/editors/object/object_group.c
    branches/smoke2/source/blender/editors/object/object_intern.h
    branches/smoke2/source/blender/editors/object/object_lattice.c
    branches/smoke2/source/blender/editors/object/object_modifier.c
    branches/smoke2/source/blender/editors/object/object_ops.c
    branches/smoke2/source/blender/editors/object/object_select.c
    branches/smoke2/source/blender/editors/physics/physics_fluid.c
    branches/smoke2/source/blender/editors/render/render_opengl.c
    branches/smoke2/source/blender/editors/screen/screen_edit.c
    branches/smoke2/source/blender/editors/screen/screen_ops.c
    branches/smoke2/source/blender/editors/sculpt_paint/paint_image.c
    branches/smoke2/source/blender/editors/sculpt_paint/sculpt.c
    branches/smoke2/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/smoke2/source/blender/editors/space_action/action_select.c
    branches/smoke2/source/blender/editors/space_api/CMakeLists.txt
    branches/smoke2/source/blender/editors/space_api/SConscript
    branches/smoke2/source/blender/editors/space_api/spacetypes.c
    branches/smoke2/source/blender/editors/space_buttons/buttons_context.c
    branches/smoke2/source/blender/editors/space_buttons/space_buttons.c
    branches/smoke2/source/blender/editors/space_clip/CMakeLists.txt
    branches/smoke2/source/blender/editors/space_clip/clip_buttons.c
    branches/smoke2/source/blender/editors/space_clip/clip_dopesheet_draw.c
    branches/smoke2/source/blender/editors/space_clip/clip_dopesheet_ops.c
    branches/smoke2/source/blender/editors/space_clip/clip_draw.c
    branches/smoke2/source/blender/editors/space_clip/clip_editor.c
    branches/smoke2/source/blender/editors/space_clip/clip_graph_draw.c
    branches/smoke2/source/blender/editors/space_clip/clip_graph_ops.c
    branches/smoke2/source/blender/editors/space_clip/clip_intern.h
    branches/smoke2/source/blender/editors/space_clip/clip_ops.c
    branches/smoke2/source/blender/editors/space_clip/clip_utils.c
    branches/smoke2/source/blender/editors/space_clip/space_clip.c
    branches/smoke2/source/blender/editors/space_clip/tracking_ops.c
    branches/smoke2/source/blender/editors/space_file/file_draw.c
    branches/smoke2/source/blender/editors/space_file/file_intern.h
    branches/smoke2/source/blender/editors/space_file/file_ops.c
    branches/smoke2/source/blender/editors/space_file/file_panels.c
    branches/smoke2/source/blender/editors/space_file/filelist.c
    branches/smoke2/source/blender/editors/space_file/filelist.h
    branches/smoke2/source/blender/editors/space_file/filesel.c
    branches/smoke2/source/blender/editors/space_file/fsmenu.c
    branches/smoke2/source/blender/editors/space_file/fsmenu.h
    branches/smoke2/source/blender/editors/space_file/space_file.c
    branches/smoke2/source/blender/editors/space_graph/graph_buttons.c
    branches/smoke2/source/blender/editors/space_graph/graph_draw.c
    branches/smoke2/source/blender/editors/space_graph/space_graph.c
    branches/smoke2/source/blender/editors/space_image/image_buttons.c
    branches/smoke2/source/blender/editors/space_image/image_ops.c
    branches/smoke2/source/blender/editors/space_image/space_image.c
    branches/smoke2/source/blender/editors/space_info/info_ops.c
    branches/smoke2/source/blender/editors/space_logic/logic_window.c
    branches/smoke2/source/blender/editors/space_nla/nla_buttons.c
    branches/smoke2/source/blender/editors/space_nla/nla_draw.c
    branches/smoke2/source/blender/editors/space_node/drawnode.c
    branches/smoke2/source/blender/editors/space_node/node_buttons.c
    branches/smoke2/source/blender/editors/space_node/node_draw.c
    branches/smoke2/source/blender/editors/space_node/node_edit.c
    branches/smoke2/source/blender/editors/space_node/node_header.c
    branches/smoke2/source/blender/editors/space_node/node_intern.h
    branches/smoke2/source/blender/editors/space_node/node_ops.c
    branches/smoke2/source/blender/editors/space_node/node_templates.c
    branches/smoke2/source/blender/editors/space_node/space_node.c
    branches/smoke2/source/blender/editors/space_outliner/outliner_draw.c
    branches/smoke2/source/blender/editors/space_outliner/outliner_edit.c
    branches/smoke2/source/blender/editors/space_outliner/outliner_select.c
    branches/smoke2/source/blender/editors/space_sequencer/sequencer_buttons.c
    branches/smoke2/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/smoke2/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/smoke2/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/smoke2/source/blender/editors/space_sequencer/sequencer_select.c
    branches/smoke2/source/blender/editors/space_sequencer/space_sequencer.c
    branches/smoke2/source/blender/editors/space_text/text_draw.c
    branches/smoke2/source/blender/editors/space_text/text_ops.c
    branches/smoke2/source/blender/editors/space_userpref/space_userpref.c
    branches/smoke2/source/blender/editors/space_view3d/drawarmature.c
    branches/smoke2/source/blender/editors/space_view3d/drawobject.c
    branches/smoke2/source/blender/editors/space_view3d/drawvolume.c
    branches/smoke2/source/blender/editors/space_view3d/view3d_buttons.c
    branches/smoke2/source/blender/editors/space_view3d/view3d_draw.c
    branches/smoke2/source/blender/editors/space_view3d/view3d_edit.c
    branches/smoke2/source/blender/editors/space_view3d/view3d_header.c
    branches/smoke2/source/blender/editors/space_view3d/view3d_select.c
    branches/smoke2/source/blender/editors/space_view3d/view3d_snap.c
    branches/smoke2/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/smoke2/source/blender/editors/space_view3d/view3d_view.c
    branches/smoke2/source/blender/editors/transform/transform.c
    branches/smoke2/source/blender/editors/transform/transform.h
    branches/smoke2/source/blender/editors/transform/transform_constraints.c
    branches/smoke2/source/blender/editors/transform/transform_conversions.c
    branches/smoke2/source/blender/editors/transform/transform_generics.c
    branches/smoke2/source/blender/editors/transform/transform_manipulator.c
    branches/smoke2/source/blender/editors/transform/transform_ops.c
    branches/smoke2/source/blender/editors/transform/transform_snap.c
    branches/smoke2/source/blender/editors/util/undo.c
    branches/smoke2/source/blender/editors/uvedit/uvedit_draw.c
    branches/smoke2/source/blender/editors/uvedit/uvedit_ops.c
    branches/smoke2/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/smoke2/source/blender/gpu/CMakeLists.txt
    branches/smoke2/source/blender/gpu/GPU_draw.h
    branches/smoke2/source/blender/gpu/SConscript
    branches/smoke2/source/blender/gpu/intern/gpu_draw.c
    branches/smoke2/source/blender/ikplugin/intern/iksolver_plugin.c
    branches/smoke2/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/smoke2/source/blender/imbuf/IMB_imbuf_types.h
    branches/smoke2/source/blender/imbuf/intern/allocimbuf.c
    branches/smoke2/source/blender/imbuf/intern/anim_movie.c
    branches/smoke2/source/blender/imbuf/intern/cineon/cineon_dpx.c
    branches/smoke2/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/smoke2/source/blender/imbuf/intern/dds/DirectDrawSurface.h
    branches/smoke2/source/blender/imbuf/intern/dds/dds_api.cpp
    branches/smoke2/source/blender/imbuf/intern/imbuf.h
    branches/smoke2/source/blender/imbuf/intern/indexer.c
    branches/smoke2/source/blender/imbuf/intern/jp2.c
    branches/smoke2/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/smoke2/source/blender/imbuf/intern/tiff.c
    branches/smoke2/source/blender/imbuf/intern/util.c
    branches/smoke2/source/blender/makesdna/DNA_ID.h
    branches/smoke2/source/blender/makesdna/DNA_action_types.h
    branches/smoke2/source/blender/makesdna/DNA_anim_types.h
    branches/smoke2/source/blender/makesdna/DNA_armature_types.h
    branches/smoke2/source/blender/makesdna/DNA_boid_types.h
    branches/smoke2/source/blender/makesdna/DNA_brush_types.h
    branches/smoke2/source/blender/makesdna/DNA_color_types.h
    branches/smoke2/source/blender/makesdna/DNA_constraint_types.h
    branches/smoke2/source/blender/makesdna/DNA_curve_types.h
    branches/smoke2/source/blender/makesdna/DNA_image_types.h
    branches/smoke2/source/blender/makesdna/DNA_mask_types.h
    branches/smoke2/source/blender/makesdna/DNA_meshdata_types.h
    branches/smoke2/source/blender/makesdna/DNA_modifier_types.h
    branches/smoke2/source/blender/makesdna/DNA_movieclip_types.h
    branches/smoke2/source/blender/makesdna/DNA_node_types.h
    branches/smoke2/source/blender/makesdna/DNA_object_force.h
    branches/smoke2/source/blender/makesdna/DNA_object_types.h
    branches/smoke2/source/blender/makesdna/DNA_packedFile_types.h
    branches/smoke2/source/blender/makesdna/DNA_scene_types.h
    branches/smoke2/source/blender/makesdna/DNA_screen_types.h
    branches/smoke2/source/blender/makesdna/DNA_sound_types.h
    branches/smoke2/source/blender/makesdna/DNA_space_types.h
    branches/smoke2/source/blender/makesdna/DNA_tracking_types.h
    branches/smoke2/source/blender/makesdna/DNA_userdef_types.h
    branches/smoke2/source/blender/makesdna/DNA_view3d_types.h
    branches/smoke2/source/blender/makesdna/DNA_windowmanager_types.h
    branches/smoke2/source/blender/makesdna/intern/dna_genfile.c
    branches/smoke2/source/blender/makesdna/intern/makesdna.c
    branches/smoke2/source/blender/makesrna/RNA_enum_types.h
    branches/smoke2/source/blender/makesrna/intern/makesrna.c
    branches/smoke2/source/blender/makesrna/intern/rna_animation.c
    branches/smoke2/source/blender/makesrna/intern/rna_animviz.c
    branches/smoke2/source/blender/makesrna/intern/rna_color.c
    branches/smoke2/source/blender/makesrna/intern/rna_constraint.c
    branches/smoke2/source/blender/makesrna/intern/rna_curve.c
    branches/smoke2/source/blender/makesrna/intern/rna_define.c
    branches/smoke2/source/blender/makesrna/intern/rna_fcurve.c
    branches/smoke2/source/blender/makesrna/intern/rna_fluidsim.c
    branches/smoke2/source/blender/makesrna/intern/rna_image_api.c
    branches/smoke2/source/blender/makesrna/intern/rna_lamp.c
    branches/smoke2/source/blender/makesrna/intern/rna_main.c
    branches/smoke2/source/blender/makesrna/intern/rna_main_api.c
    branches/smoke2/source/blender/makesrna/intern/rna_mask.c
    branches/smoke2/source/blender/makesrna/intern/rna_material.c
    branches/smoke2/source/blender/makesrna/intern/rna_mesh.c
    branches/smoke2/source/blender/makesrna/intern/rna_modifier.c
    branches/smoke2/source/blender/makesrna/intern/rna_movieclip.c
    branches/smoke2/source/blender/makesrna/intern/rna_nodetree.c
    branches/smoke2/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/smoke2/source/blender/makesrna/intern/rna_object.c
    branches/smoke2/source/blender/makesrna/intern/rna_object_force.c
    branches/smoke2/source/blender/makesrna/intern/rna_pose.c
    branches/smoke2/source/blender/makesrna/intern/rna_scene.c
    branches/smoke2/source/blender/makesrna/intern/rna_scene_api.c
    branches/smoke2/source/blender/makesrna/intern/rna_screen.c
    branches/smoke2/source/blender/makesrna/intern/rna_sensor.c
    branches/smoke2/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/smoke2/source/blender/makesrna/intern/rna_smoke.c
    branches/smoke2/source/blender/makesrna/intern/rna_space.c
    branches/smoke2/source/blender/makesrna/intern/rna_texture.c
    branches/smoke2/source/blender/makesrna/intern/rna_tracking.c
    branches/smoke2/source/blender/makesrna/intern/rna_ui.c
    branches/smoke2/source/blender/makesrna/intern/rna_userdef.c
    branches/smoke2/source/blender/modifiers/intern/MOD_array.c
    branches/smoke2/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/smoke2/source/blender/modifiers/intern/MOD_mask.c
    branches/smoke2/source/blender/modifiers/intern/MOD_screw.c
    branches/smoke2/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/smoke2/source/blender/modifiers/intern/MOD_skin.c
    branches/smoke2/source/blender/nodes/CMakeLists.txt
    branches/smoke2/source/blender/nodes/NOD_composite.h
    branches/smoke2/source/blender/nodes/SConscript
    branches/smoke2/source/blender/nodes/composite/node_composite_tree.c
    branches/smoke2/source/blender/nodes/composite/node_composite_util.c
    branches/smoke2/source/blender/nodes/composite/node_composite_util.h
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_dilate.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_mask.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_movieclip.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/smoke2/source/blender/nodes/intern/node_common.c
    branches/smoke2/source/blender/nodes/intern/node_common.h
    branches/smoke2/source/blender/nodes/intern/node_socket.c
    branches/smoke2/source/blender/nodes/shader/nodes/node_shader_particle_info.c
    branches/smoke2/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/smoke2/source/blender/nodes/texture/node_texture_tree.c
    branches/smoke2/source/blender/nodes/texture/node_texture_util.c
    branches/smoke2/source/blender/nodes/texture/node_texture_util.h
    branches/smoke2/source/blender/nodes/texture/nodes/node_texture_coord.c
    branches/smoke2/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
    branches/smoke2/source/blender/nodes/texture/nodes/node_texture_proc.c
    branches/smoke2/source/blender/nodes/texture/nodes/node_texture_texture.c
    branches/smoke2/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
    branches/smoke2/source/blender/opencl/CMakeLists.txt
    branches/smoke2/source/blender/python/bmesh/CMakeLists.txt
    branches/smoke2/source/blender/python/bmesh/bmesh_py_api.c
    branches/smoke2/source/blender/python/bmesh/bmesh_py_types.h
    branches/smoke2/source/blender/python/bmesh/bmesh_py_utils.c
    branches/smoke2/source/blender/python/generic/bpy_internal_import.c
    branches/smoke2/source/blender/python/generic/bpy_internal_import.h
    branches/smoke2/source/blender/python/intern/bpy_operator.c
    branches/smoke2/source/blender/python/intern/bpy_rna.c
    branches/smoke2/source/blender/python/intern/stubs.c
    branches/smoke2/source/blender/python/mathutils/mathutils.c
    branches/smoke2/source/blender/python/mathutils/mathutils_Matrix.c
    branches/smoke2/source/blender/python/mathutils/mathutils_Vector.c
    branches/smoke2/source/blender/python/mathutils/mathutils_geometry.c
    branches/smoke2/source/blender/render/extern/include/RE_pipeline.h
    branches/smoke2/source/blender/render/intern/raytrace/bvh.h
    branches/smoke2/source/blender/render/intern/raytrace/rayobject_instance.cpp
    branches/smoke2/source/blender/render/intern/source/convertblender.c
    branches/smoke2/source/blender/render/intern/source/external_engine.c
    branches/smoke2/source/blender/render/intern/source/initrender.c
    branches/smoke2/source/blender/render/intern/source/occlusion.c
    branches/smoke2/source/blender/render/intern/source/pipeline.c
    branches/smoke2/source/blender/render/intern/source/pixelblending.c
    branches/smoke2/source/blender/render/intern/source/render_result.c
    branches/smoke2/source/blender/render/intern/source/render_texture.c
    branches/smoke2/source/blender/render/intern/source/rendercore.c
    branches/smoke2/source/blender/render/intern/source/strand.c
    branches/smoke2/source/blender/render/intern/source/volumetric.c
    branches/smoke2/source/blender/render/intern/source/zbuf.c
    branches/smoke2/source/blender/windowmanager/CMakeLists.txt
    branches/smoke2/source/blender/windowmanager/WM_api.h
    branches/smoke2/source/blender/windowmanager/intern/wm_draw.c
    branches/smoke2/source/blender/windowmanager/intern/wm_event_system.c
    branches/smoke2/source/blender/windowmanager/intern/wm_init_exit.c
    branches/smoke2/source/blender/windowmanager/intern/wm_jobs.c
    branches/smoke2/source/blender/windowmanager/intern/wm_operators.c
    branches/smoke2/source/blender/windowmanager/intern/wm_subwindow.c
    branches/smoke2/source/blender/windowmanager/intern/wm_window.c
    branches/smoke2/source/blender/windowmanager/wm_window.h
    branches/smoke2/source/blenderplayer/CMakeLists.txt
    branches/smoke2/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/smoke2/source/creator/CMakeLists.txt
    branches/smoke2/source/creator/creator.c
    branches/smoke2/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/smoke2/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
    branches/smoke2/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
    branches/smoke2/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
    branches/smoke2/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/smoke2/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
    branches/smoke2/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/smoke2/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/smoke2/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/smoke2/source/gameengine/Converter/BL_MeshDeformer.h
    branches/smoke2/source/gameengine/Converter/BL_ModifierDeformer.h
    branches/smoke2/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/smoke2/source/gameengine/Converter/BL_SkinDeformer.h
    branches/smoke2/source/gameengine/Converter/BlenderWorldInfo.h
    branches/smoke2/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
    branches/smoke2/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/smoke2/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/smoke2/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/smoke2/source/gameengine/Converter/KX_SoftBodyDeformer.h
    branches/smoke2/source/gameengine/Expressions/BoolValue.h
    branches/smoke2/source/gameengine/Expressions/ConstExpr.h
    branches/smoke2/source/gameengine/Expressions/EmptyValue.h
    branches/smoke2/source/gameengine/Expressions/ErrorValue.h
    branches/smoke2/source/gameengine/Expressions/Expression.h
    branches/smoke2/source/gameengine/Expressions/FloatValue.h
    branches/smoke2/source/gameengine/Expressions/IdentifierExpr.h
    branches/smoke2/source/gameengine/Expressions/IfExpr.h
    branches/smoke2/source/gameengine/Expressions/InputParser.h
    branches/smoke2/source/gameengine/Expressions/IntValue.h
    branches/smoke2/source/gameengine/Expressions/KX_HashedPtr.h
    branches/smoke2/source/gameengine/Expressions/Operator1Expr.h
    branches/smoke2/source/gameengine/Expressions/Operator2Expr.h
    branches/smoke2/source/gameengine/Expressions/PyObjectPlus.h
    branches/smoke2/source/gameengine/Expressions/StringValue.h
    branches/smoke2/source/gameengine/Expressions/Value.cpp
    branches/smoke2/source/gameengine/Expressions/Value.h
    branches/smoke2/source/gameengine/Expressions/VectorValue.h
    branches/smoke2/source/gameengine/Expressions/VoidValue.h
    branches/smoke2/source/gameengine/GameLogic/CMakeLists.txt
    branches/smoke2/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
    branches/smoke2/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
    branches/smoke2/source/gameengine/GameLogic/SCA_BasicEventManager.h
    branches/smoke2/source/gameengine/GameLogic/SCA_EventManager.h
    branches/smoke2/source/gameengine/GameLogic/SCA_ExpressionController.h
    branches/smoke2/source/gameengine/GameLogic/SCA_IActuator.h
    branches/smoke2/source/gameengine/GameLogic/SCA_IInputDevice.h
    branches/smoke2/source/gameengine/GameLogic/SCA_ILogicBrick.h
    branches/smoke2/source/gameengine/GameLogic/SCA_IScene.h
    branches/smoke2/source/gameengine/GameLogic/SCA_JoystickManager.h
    branches/smoke2/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/smoke2/source/gameengine/GameLogic/SCA_KeyboardManager.h
    branches/smoke2/source/gameengine/GameLogic/SCA_LogicManager.cpp
    branches/smoke2/source/gameengine/GameLogic/SCA_LogicManager.h
    branches/smoke2/source/gameengine/GameLogic/SCA_MouseManager.h
    branches/smoke2/source/gameengine/GameLogic/SCA_PropertyEventManager.h
    branches/smoke2/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/smoke2/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/smoke2/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp
    branches/smoke2/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/smoke2/source/gameengine/GameLogic/SCA_RandomEventManager.h
    branches/smoke2/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
    branches/smoke2/source/gameengine/GameLogic/SCA_TimeEventManager.h
    branches/smoke2/source/gameengine/GameLogic/SConscript
    branches/smoke2/source/gameengine/GamePlayer/common/GPC_Canvas.h
    branches/smoke2/source/gameengine/Ketsji/BL_Action.cpp
    branches/smoke2/source/gameengine/Ketsji/BL_Action.h
    branches/smoke2/source/gameengine/Ketsji/BL_ActionManager.h
    branches/smoke2/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/smoke2/source/gameengine/Ketsji/BL_Material.h
    branches/smoke2/source/gameengine/Ketsji/BL_Shader.cpp
    branches/smoke2/source/gameengine/Ketsji/BL_Shader.h
    branches/smoke2/source/gameengine/Ketsji/BL_Texture.cpp
    branches/smoke2/source/gameengine/Ketsji/BL_Texture.h
    branches/smoke2/source/gameengine/Ketsji/CMakeLists.txt
    branches/smoke2/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/smoke2/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/smoke2/source/gameengine/Ketsji/KX_CameraIpoSGController.h
    branches/smoke2/source/gameengine/Ketsji/KX_ClientObjectInfo.h
    branches/smoke2/source/gameengine/Ketsji/KX_Dome.cpp
    branches/smoke2/source/gameengine/Ketsji/KX_Dome.h
    branches/smoke2/source/gameengine/Ketsji/KX_EmptyObject.h
    branches/smoke2/source/gameengine/Ketsji/KX_FontObject.h
    branches/smoke2/source/gameengine/Ketsji/KX_IInterpolator.h
    branches/smoke2/source/gameengine/Ketsji/KX_IPO_SGController.h
    branches/smoke2/source/gameengine/Ketsji/KX_IPhysicsController.h
    branches/smoke2/source/gameengine/Ketsji/KX_IScalarInterpolator.h
    branches/smoke2/source/gameengine/Ketsji/KX_ISceneConverter.h
    branches/smoke2/source/gameengine/Ketsji/KX_ISystem.h
    branches/smoke2/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/smoke2/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/smoke2/source/gameengine/Ketsji/KX_LightIpoSGController.h
    branches/smoke2/source/gameengine/Ketsji/KX_MaterialIpoController.h
    branches/smoke2/source/gameengine/Ketsji/KX_MotionState.h
    branches/smoke2/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
    branches/smoke2/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
    branches/smoke2/source/gameengine/Ketsji/KX_OrientationInterpolator.h
    branches/smoke2/source/gameengine/Ketsji/KX_PositionInterpolator.h
    branches/smoke2/source/gameengine/Ketsji/KX_PyMath.h
    branches/smoke2/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/smoke2/source/gameengine/Ketsji/KX_PythonInit.h
    branches/smoke2/source/gameengine/Ketsji/KX_RadarSensor.cpp
    branches/smoke2/source/gameengine/Ketsji/KX_RadarSensor.h
    branches/smoke2/source/gameengine/Ketsji/KX_RayCast.h
    branches/smoke2/source/gameengine/Ketsji/KX_RayEventManager.h
    branches/smoke2/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/smoke2/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
    branches/smoke2/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
    branches/smoke2/source/gameengine/Ketsji/KX_ScalarInterpolator.h
    branches/smoke2/source/gameengine/Ketsji/KX_ScalingInterpolator.h
    branches/smoke2/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
    branches/smoke2/source/gameengine/Ketsji/KX_TimeLogger.h
    branches/smoke2/source/gameengine/Ketsji/KX_TouchEventManager.h
    branches/smoke2/source/gameengine/Ketsji/KX_WorldInfo.h
    branches/smoke2/source/gameengine/Ketsji/KX_WorldIpoController.h
    branches/smoke2/source/gameengine/Network/NG_NetworkDeviceInterface.h
    branches/smoke2/source/gameengine/Network/NG_NetworkMessage.h
    branches/smoke2/source/gameengine/Network/NG_NetworkObject.h
    branches/smoke2/source/gameengine/Network/NG_NetworkScene.h
    branches/smoke2/source/gameengine/Physics/Bullet/CcdGraphicController.h
    branches/smoke2/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/smoke2/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/smoke2/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/smoke2/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
    branches/smoke2/source/gameengine/Physics/common/PHY_IController.h
    branches/smoke2/source/gameengine/Physics/common/PHY_IGraphicController.h
    branches/smoke2/source/gameengine/Physics/common/PHY_IMotionState.h
    branches/smoke2/source/gameengine/Physics/common/PHY_IPhysicsController.h
    branches/smoke2/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/smoke2/source/gameengine/Physics/common/PHY_IVehicle.h
    branches/smoke2/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/smoke2/source/gameengine/Rasterizer/RAS_2DFilterManager.h
    branches/smoke2/source/gameengine/Rasterizer/RAS_BucketManager.h
    branches/smoke2/source/gameengine/Rasterizer/RAS_Deformer.h
    branches/smoke2/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/smoke2/source/gameengine/Rasterizer/RAS_ICanvas.h
    branches/smoke2/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/smoke2/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/smoke2/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/smoke2/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    branches/smoke2/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/smoke2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
    branches/smoke2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/smoke2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
    branches/smoke2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
    branches/smoke2/source/gameengine/Rasterizer/RAS_Polygon.h
    branches/smoke2/source/gameengine/Rasterizer/RAS_Rect.h
    branches/smoke2/source/gameengine/Rasterizer/RAS_TexVert.h
    branches/smoke2/source/gameengine/SceneGraph/SG_BBox.h
    branches/smoke2/source/gameengine/SceneGraph/SG_Controller.h
    branches/smoke2/source/gameengine/SceneGraph/SG_DList.h
    branches/smoke2/source/gameengine/SceneGraph/SG_IObject.h
    branches/smoke2/source/gameengine/SceneGraph/SG_Node.h
    branches/smoke2/source/gameengine/SceneGraph/SG_ParentRelation.h
    branches/smoke2/source/gameengine/SceneGraph/SG_QList.h
    branches/smoke2/source/gameengine/SceneGraph/SG_Spatial.h
    branches/smoke2/source/gameengine/SceneGraph/SG_Tree.h
    branches/smoke2/source/gameengine/VideoTexture/Exception.cpp
    branches/smoke2/source/gameengine/VideoTexture/FilterBase.cpp
    branches/smoke2/source/gameengine/VideoTexture/FilterBase.h
    branches/smoke2/source/gameengine/VideoTexture/FilterBlueScreen.cpp
    branches/smoke2/source/gameengine/VideoTexture/FilterColor.cpp
    branches/smoke2/source/gameengine/VideoTexture/FilterNormal.cpp
    branches/smoke2/source/gameengine/VideoTexture/FilterSource.cpp
    branches/smoke2/source/gameengine/VideoTexture/ImageBase.cpp
    branches/smoke2/source/gameengine/VideoTexture/ImageBase.h
    branches/smoke2/source/gameengine/VideoTexture/ImageBuff.cpp
    branches/smoke2/source/gameengine/VideoTexture/ImageMix.cpp
    branches/smoke2/source/gameengine/VideoTexture/ImageRender.cpp
    branches/smoke2/source/gameengine/VideoTexture/ImageRender.h
    branches/smoke2/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/smoke2/source/gameengine/VideoTexture/PyTypeList.cpp
    branches/smoke2/source/gameengine/VideoTexture/PyTypeList.h
    branches/smoke2/source/gameengine/VideoTexture/Texture.cpp
    branches/smoke2/source/gameengine/VideoTexture/Texture.h
    branches/smoke2/source/gameengine/VideoTexture/VideoBase.h
    branches/smoke2/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/smoke2/source/gameengine/VideoTexture/VideoFFmpeg.h
    branches/smoke2/source/gameengine/VideoTexture/blendVideoTex.cpp
    branches/smoke2/source/tools/check_style_c.py

Added Paths:
-----------
    branches/smoke2/extern/libopenjpeg/cidx_manager.c
    branches/smoke2/extern/libopenjpeg/cidx_manager.h
    branches/smoke2/extern/libopenjpeg/indexbox_manager.h
    branches/smoke2/extern/libopenjpeg/opj_config.h
    branches/smoke2/extern/libopenjpeg/phix_manager.c
    branches/smoke2/extern/libopenjpeg/ppix_manager.c
    branches/smoke2/extern/libopenjpeg/thix_manager.c
    branches/smoke2/extern/libopenjpeg/tpix_manager.c
    branches/smoke2/release/scripts/modules/bl_i18n_utils/
    branches/smoke2/release/scripts/presets/operator/wm.collada_export/second_life_rigged.py
    branches/smoke2/release/scripts/presets/operator/wm.collada_export/second_life_static.py
    branches/smoke2/release/scripts/templates/operator_modal_view3d_raycast.py
    branches/smoke2/source/blender/blenlib/BLI_voronoi.h
    branches/smoke2/source/blender/blenlib/intern/voronoi.c
    branches/smoke2/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp
    branches/smoke2/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h
    branches/smoke2/source/blender/compositor/nodes/COM_KeyingNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_KeyingNode.h
    branches/smoke2/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp
    branches/smoke2/source/blender/compositor/nodes/COM_KeyingScreenNode.h
    branches/smoke2/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_GlareFogGlowOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_KeyingBlurOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_KeyingClipOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_KeyingClipOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_KeyingDespillOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_KeyingOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_KeyingOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_KeyingScreenOperation.h
    branches/smoke2/source/blender/compositor/operations/COM_MixGlareOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_MixGlareOperation.h
    branches/smoke2/source/blender/editors/io/
    branches/smoke2/source/blender/editors/space_clip/tracking_select.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_keying.c
    branches/smoke2/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
    branches/smoke2/source/blender/python/bmesh/bmesh_py_ops.c
    branches/smoke2/source/blender/python/bmesh/bmesh_py_ops.h

Removed Paths:
-------------
    branches/smoke2/release/scripts/presets/operator/wm.collada_export/second_life.py
    branches/smoke2/source/blender/compositor/operations/COM_FogGlowImageOperation.cpp
    branches/smoke2/source/blender/compositor/operations/COM_FogGlowImageOperation.h
    branches/smoke2/source/creator/SConscript

Property Changed:
----------------
    branches/smoke2/source/blender/editors/interface/interface.c
    branches/smoke2/source/blender/editors/space_outliner/

Modified: branches/smoke2/CMakeLists.txt
===================================================================
--- branches/smoke2/CMakeLists.txt	2012-07-03 22:10:59 UTC (rev 48567)
+++ branches/smoke2/CMakeLists.txt	2012-07-03 22:34:49 UTC (rev 48568)
@@ -123,13 +123,14 @@
 mark_as_advanced(WITH_PYTHON_SECURITY)  # some distrobutions see this as a security issue, rather than have them patch it, make a build option.
 
 option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
-option(WITH_PYTHON_MODULE "Enable building as a python module (experimental, only enable for development)" OFF)
+option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF)
 option(WITH_BUILDINFO     "Include extra build details (only disable for development & faster builds)" ON)
 option(WITH_IK_ITASC      "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
 option(WITH_FFTW3         "Enable FFTW3 support (Used for smoke and audio effects)" ON)
 option(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 option(WITH_GAMEENGINE    "Enable Game Engine" ON)
 option(WITH_PLAYER        "Build Player" OFF)
+option(WITH_COMPOSITOR    "Enable the tile based nodal compositor" ON)
 
 # GHOST Windowing Library Options
 option(WITH_GHOST_DEBUG   "Enable debugging output for the GHOST library" OFF)
@@ -159,7 +160,7 @@
 if(UNIX AND NOT APPLE)
 	option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)"	ON)
 	option(WITH_X11_XF86VMODE "Enable X11 video mode switching"	ON)
-	option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
+	option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" ON)
 
 	# freebsd doesn't seems to support XDND
 	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
@@ -167,9 +168,20 @@
 	endif()
 else()
 	# not an option for other OS's
-	set(WITH_BUILTIN_GLEW ON)
+	set(WITH_SYSTEM_GLEW OFF)
 endif()
 
+
+# (unix defaults to System OpenJPEG On)
+if(UNIX AND NOT APPLE)
+	set(PLATFORM_DEFAULT ON)
+else()
+	set(PLATFORM_DEFAULT OFF)
+endif()
+option(WITH_SYSTEM_OPENJPEG "Use the operating systems OpenJPEG library" ${PLATFORM_DEFAULT})
+unset(PLATFORM_DEFAULT)
+
+
 # Modifiers
 option(WITH_MOD_FLUID        	"Enable Elbeem Modifier (Fluid Simulation)" ON)
 option(WITH_MOD_SMOKE        	"Enable Smoke Modifier (Smoke Simulation)" ON)
@@ -451,11 +463,6 @@
 
 if(UNIX AND NOT APPLE)
 
-	# needed for ubuntu 11.04
-	if(EXISTS "/usr/lib/x86_64-linux-gnu")
-		set(CMAKE_LIBRARY_PATH "/usr/lib/x86_64-linux-gnu;${CMAKE_LIBRARY_PATH}")
-	endif()
-
 	# set lib directory if it exists
 	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
@@ -660,7 +667,6 @@
 
 		if(NOT OPENIMAGEIO_FOUND)
 			set(WITH_OPENIMAGEIO OFF)
-			set(WITH_CYCLES OFF)
 			message(STATUS "OpenImageIO not found, disabling WITH_CYCLES")
 		endif()
 	endif()
@@ -987,8 +993,8 @@
 				set(BOOST_POSTFIX "vc100-mt-s-1_47.lib")
 				set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_47.lib")
 			else()
-				set(BOOST_POSTFIX "vc90-mt-s-1_47.lib")
-				set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_47.lib")					
+				set(BOOST_POSTFIX "vc90-mt-s-1_49.lib")
+				set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_49.lib")					
 			endif()
 			set(BOOST_LIBRARIES
 				optimized libboost_date_time-${BOOST_POSTFIX} optimized libboost_filesystem-${BOOST_POSTFIX}
@@ -1451,6 +1457,16 @@
 	endif()
 endif()
 
+if(WITH_CYCLES)
+	if(NOT WITH_OPENIMAGEIO)
+		message(FATAL_ERROR "Cycles reqires WITH_OPENIMAGEIO, the library may not have been found. Configure OIIO or disable WITH_CYCLES")
+	endif()
+	if(NOT WITH_BOOST)
+		message(FATAL_ERROR "Cycles reqires WITH_BOOST, the library may not have been found. Configure BOOST or disable WITH_CYCLES")
+	endif()
+endif()
+
+
 # See TEST_SSE_SUPPORT() for how this is defined.
 
 if(WITH_RAYOPTIMIZATION)
@@ -1485,10 +1501,11 @@
 
 
 if(WITH_IMAGE_OPENJPEG)
-	if(UNIX AND NOT APPLE)
+	if(WITH_SYSTEM_OPENJPEG)
 		# dealt with above
 	else()
 		set(OPENJPEG_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/libopenjpeg")
+		add_definitions(-DOPJ_STATIC)
 	endif()
 endif()
 
@@ -1539,20 +1556,20 @@
 #-----------------------------------------------------------------------------
 # Configure GLEW
 
-if(WITH_BUILTIN_GLEW)
-	# set(GLEW_LIBRARY "")  # unused
-	set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
-else()
+if(WITH_SYSTEM_GLEW)
 	find_package(GLEW)
 
 	if(NOT GLEW_FOUND)
-		message(FATAL_ERROR "GLEW is required to build blender, install it or use WITH_BUILTIN_GLEW")
+		message(FATAL_ERROR "GLEW is required to build blender, install it or disable WITH_SYSTEM_GLEW")
 	endif()
 
 	mark_as_advanced(
 		GLEW_LIBRARY
 		GLEW_INCLUDE_PATH
 	)
+else()
+	# set(GLEW_LIBRARY "")  # unused
+	set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
 endif()
 
 #-----------------------------------------------------------------------------
@@ -1711,6 +1728,7 @@
 # better not set includes here but this debugging option is off by default.
 if(WITH_CXX_GUARDEDALLOC)
 	include_directories(${CMAKE_SOURCE_DIR}/intern/guardedalloc)
+	add_definitions(-DWITH_CXX_GUARDEDALLOC)
 endif()
 
 if(WITH_ASSERT_ABORT)
@@ -1790,8 +1808,9 @@
 	info_cfg_option(WITH_INSTALL_PORTABLE)
 	info_cfg_option(WITH_X11_XF86VMODE)
 	info_cfg_option(WITH_X11_XINPUT)
-	info_cfg_option(WITH_BUILTIN_GLEW)
 	info_cfg_option(WITH_MEM_JEMALLOC)
+	info_cfg_option(WITH_SYSTEM_GLEW)
+	info_cfg_option(WITH_SYSTEM_OPENJPEG)
 
 	info_cfg_text("Image Formats:")
 	info_cfg_option(WITH_IMAGE_CINEON)

Modified: branches/smoke2/SConstruct
===================================================================
--- branches/smoke2/SConstruct	2012-07-03 22:10:59 UTC (rev 48567)
+++ branches/smoke2/SConstruct	2012-07-03 22:34:49 UTC (rev 48568)
@@ -240,6 +240,7 @@
 if 'blenderlite' in B.targets:
     target_env_defs = {}
     target_env_defs['WITH_BF_GAMEENGINE'] = False
+    target_env_defs['WITH_BF_CYCLES'] = False
     target_env_defs['WITH_BF_OPENAL'] = False
     target_env_defs['WITH_BF_OPENEXR'] = False
     target_env_defs['WITH_BF_OPENMP'] = False

Modified: branches/smoke2/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/smoke2/build_files/cmake/config/blender_lite.cmake	2012-07-03 22:10:59 UTC (rev 48567)
+++ branches/smoke2/build_files/cmake/config/blender_lite.cmake	2012-07-03 22:34:49 UTC (rev 48568)
@@ -6,9 +6,9 @@
 #
 
 set(WITH_INSTALL_PORTABLE    ON  CACHE FORCE BOOL)
+set(WITH_SYSTEM_GLEW         ON  CACHE FORCE BOOL)
 
 set(WITH_BUILDINFO           OFF CACHE FORCE BOOL)
-set(WITH_BUILTIN_GLEW        OFF CACHE FORCE BOOL)
 set(WITH_BULLET              OFF CACHE FORCE BOOL)
 set(WITH_CODEC_FFMPEG        OFF CACHE FORCE BOOL)
 set(WITH_CODEC_SNDFILE       OFF CACHE FORCE BOOL)

Modified: branches/smoke2/build_files/cmake/macros.cmake
===================================================================
--- branches/smoke2/build_files/cmake/macros.cmake	2012-07-03 22:10:59 UTC (rev 48567)
+++ branches/smoke2/build_files/cmake/macros.cmake	2012-07-03 22:34:49 UTC (rev 48568)
@@ -193,7 +193,7 @@
 	if(WITH_OPENIMAGEIO)
 		link_directories(${OPENIMAGEIO_LIBPATH})
 	endif()
-	if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE)
+	if(WITH_IMAGE_OPENJPEG AND WITH_SYSTEM_OPENJPEG)
 		link_directories(${OPENJPEG_LIBPATH})
 	endif()
 	if(WITH_CODEC_QUICKTIME)
@@ -236,8 +236,7 @@
 			${OPENGL_glu_LIBRARY}
 			${PNG_LIBRARIES}
 			${ZLIB_LIBRARIES}
-			${FREETYPE_LIBRARY}
-			${LAPACK_LIBRARIES})
+			${FREETYPE_LIBRARY})
 
 	# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
 	if(WITH_PYTHON)  # AND NOT WITH_PYTHON_MODULE  # WIN32 needs
@@ -253,7 +252,7 @@
 		endif()
 	endif()
 
-	if(NOT WITH_BUILTIN_GLEW)
+	if(WITH_SYSTEM_GLEW)
 		target_link_libraries(${target} ${GLEW_LIBRARY})
 	endif()
 
@@ -303,7 +302,7 @@
 			target_link_libraries(${target} ${OPENEXR_LIBRARIES})
 		endif()
 	endif()
-	if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE)
+	if(WITH_IMAGE_OPENJPEG AND WITH_SYSTEM_OPENJPEG)
 		target_link_libraries(${target} ${OPENJPEG_LIBRARIES})
 	endif()
 	if(WITH_CODEC_FFMPEG)
@@ -346,7 +345,9 @@
 	if(WITH_INPUT_NDOF)
 		target_link_libraries(${target} ${NDOF_LIBRARIES})
 	endif()
-
+	if(WITH_MOD_CLOTH_ELTOPO)
+		target_link_libraries(${target} ${LAPACK_LIBRARIES})
+	endif()
 	if(WIN32 AND NOT UNIX)
 		target_link_libraries(${target} ${PTHREADS_LIBRARIES})
 	endif()
@@ -452,6 +453,12 @@
 		add_cc_flag("${CC_REMOVE_STRICT_FLAGS}")
 	endif()
 
+	if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+		remove_cc_flag("-Wunused-parameter")
+		remove_cc_flag("-Wunused-variable")
+		remove_cc_flag("-Werror")
+	endif()
+
 	if(MSVC)
 		# TODO
 	endif()

Modified: branches/smoke2/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/smoke2/build_files/scons/config/win32-mingw-config.py	2012-07-03 22:10:59 UTC (rev 48567)
+++ branches/smoke2/build_files/scons/config/win32-mingw-config.py	2012-07-03 22:34:49 UTC (rev 48568)
@@ -181,7 +181,7 @@
 CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
 CXXFLAGS = []
 
-CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC']
+CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC', '-DOPJ_STATIC']
 REL_CFLAGS = []
 REL_CXXFLAGS = []
 REL_CCFLAGS = ['-DNDEBUG',  '-O2']

Modified: branches/smoke2/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/smoke2/build_files/scons/config/win32-vc-config.py	2012-07-03 22:10:59 UTC (rev 48567)
+++ branches/smoke2/build_files/scons/config/win32-vc-config.py	2012-07-03 22:34:49 UTC (rev 48568)
@@ -159,7 +159,7 @@
 WITH_BF_BOOST = True
 BF_BOOST = '${LIBDIR}/boost'
 BF_BOOST_INC = '${BF_BOOST}/include'

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list