[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46753] branches/meshdata_transfer: svn merge ^/trunk/blender -r46644:HEAD

[Ove Murberg Henriksen]

Revision: 46753
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46753
Author:   cyborgmuppet
Date:     2012-05-17 23:34:54 +0000 (Thu, 17 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46644:HEAD

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

Modified Paths:
--------------
    branches/meshdata_transfer/CMakeLists.txt
    branches/meshdata_transfer/build_files/cmake/macros.cmake
    branches/meshdata_transfer/build_files/cmake/packaging.cmake
    branches/meshdata_transfer/build_files/package_spec/rpm/blender.spec.in
    branches/meshdata_transfer/extern/eltopo/CMakeLists.txt
    branches/meshdata_transfer/extern/eltopo/common/ccd_defs.h
    branches/meshdata_transfer/extern/eltopo/eltopo3d/collisionpipeline.cpp
    branches/meshdata_transfer/extern/eltopo/eltopo3d/dynamicsurface.cpp
    branches/meshdata_transfer/extern/eltopo/eltopo3d/dynamicsurface.h
    branches/meshdata_transfer/extern/eltopo/eltopo3d/eltopo.cpp
    branches/meshdata_transfer/intern/cycles/kernel/osl/nodes/node_camera.osl
    branches/meshdata_transfer/intern/elbeem/intern/globals.h
    branches/meshdata_transfer/intern/elbeem/intern/ntl_geometryobject.cpp
    branches/meshdata_transfer/release/scripts/startup/bl_operators/console.py
    branches/meshdata_transfer/release/scripts/startup/bl_operators/image.py
    branches/meshdata_transfer/release/scripts/startup/bl_operators/presets.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_animviz.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_object.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_paint_common.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_scene.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_texture.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/space_clip.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/space_node.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/space_text.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/space_time.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/space_view3d.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/meshdata_transfer/source/blender/CMakeLists.txt
    branches/meshdata_transfer/source/blender/SConscript
    branches/meshdata_transfer/source/blender/blenkernel/BKE_ccg.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_colortools.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_customdata.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_image.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_mesh.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_node.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_object.h
    branches/meshdata_transfer/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/action.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/cloth.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/collision.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/colortools.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/curve.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/deform.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/depsgraph.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/displist.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/dynamicpaint.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/editderivedmesh.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/icons.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/idprop.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/image.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/mesh.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/multires.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/nla.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/node.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/object.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/particle_system.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/softbody.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/sound.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/tracking.c
    branches/meshdata_transfer/source/blender/blenlib/BLI_ghash.h
    branches/meshdata_transfer/source/blender/blenlib/intern/BLI_ghash.c
    branches/meshdata_transfer/source/blender/blenlib/intern/pbvh.c
    branches/meshdata_transfer/source/blender/blenloader/intern/readblenentry.c
    branches/meshdata_transfer/source/blender/blenloader/intern/readfile.c
    branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_core.c
    branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_mesh.c
    branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_operators.c
    branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_walkers.c
    branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_walkers_impl.c
    branches/meshdata_transfer/source/blender/bmesh/operators/bmo_create.c
    branches/meshdata_transfer/source/blender/bmesh/operators/bmo_dupe.c
    branches/meshdata_transfer/source/blender/bmesh/operators/bmo_hull.c
    branches/meshdata_transfer/source/blender/bmesh/tools/BME_bevel.c
    branches/meshdata_transfer/source/blender/collada/GeometryExporter.cpp
    branches/meshdata_transfer/source/blender/collada/GeometryExporter.h
    branches/meshdata_transfer/source/blender/collada/MeshImporter.cpp
    branches/meshdata_transfer/source/blender/collada/MeshImporter.h
    branches/meshdata_transfer/source/blender/editors/animation/anim_filter.c
    branches/meshdata_transfer/source/blender/editors/armature/editarmature.c
    branches/meshdata_transfer/source/blender/editors/armature/editarmature_retarget.c
    branches/meshdata_transfer/source/blender/editors/armature/editarmature_sketch.c
    branches/meshdata_transfer/source/blender/editors/armature/reeb.c
    branches/meshdata_transfer/source/blender/editors/curve/editcurve.c
    branches/meshdata_transfer/source/blender/editors/include/ED_mesh.h
    branches/meshdata_transfer/source/blender/editors/include/ED_transform.h
    branches/meshdata_transfer/source/blender/editors/interface/interface_draw.c
    branches/meshdata_transfer/source/blender/editors/interface/interface_handlers.c
    branches/meshdata_transfer/source/blender/editors/interface/interface_icons.c
    branches/meshdata_transfer/source/blender/editors/interface/interface_intern.h
    branches/meshdata_transfer/source/blender/editors/interface/interface_ops.c
    branches/meshdata_transfer/source/blender/editors/interface/interface_panel.c
    branches/meshdata_transfer/source/blender/editors/interface/interface_regions.c
    branches/meshdata_transfer/source/blender/editors/mesh/editmesh_knife.c
    branches/meshdata_transfer/source/blender/editors/mesh/editmesh_select.c
    branches/meshdata_transfer/source/blender/editors/mesh/editmesh_tools.c
    branches/meshdata_transfer/source/blender/editors/mesh/editmesh_utils.c
    branches/meshdata_transfer/source/blender/editors/mesh/mesh_ops.c
    branches/meshdata_transfer/source/blender/editors/object/object_add.c
    branches/meshdata_transfer/source/blender/editors/object/object_constraint.c
    branches/meshdata_transfer/source/blender/editors/object/object_select.c
    branches/meshdata_transfer/source/blender/editors/object/object_transform.c
    branches/meshdata_transfer/source/blender/editors/render/render_update.c
    branches/meshdata_transfer/source/blender/editors/screen/screen_ops.c
    branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_cursor.c
    branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_hide.c
    branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_image.c
    branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_ops.c
    branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/meshdata_transfer/source/blender/editors/sculpt_paint/sculpt.c
    branches/meshdata_transfer/source/blender/editors/space_clip/clip_editor.c
    branches/meshdata_transfer/source/blender/editors/space_file/file_ops.c
    branches/meshdata_transfer/source/blender/editors/space_image/image_ops.c
    branches/meshdata_transfer/source/blender/editors/space_node/drawnode.c
    branches/meshdata_transfer/source/blender/editors/space_node/node_draw.c
    branches/meshdata_transfer/source/blender/editors/space_node/node_edit.c
    branches/meshdata_transfer/source/blender/editors/space_node/node_intern.h
    branches/meshdata_transfer/source/blender/editors/space_node/node_ops.c
    branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/meshdata_transfer/source/blender/editors/space_view3d/drawobject.c
    branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_draw.c
    branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_edit.c
    branches/meshdata_transfer/source/blender/editors/transform/transform.c
    branches/meshdata_transfer/source/blender/editors/transform/transform_conversions.c
    branches/meshdata_transfer/source/blender/gpu/intern/gpu_buffers.c
    branches/meshdata_transfer/source/blender/gpu/intern/gpu_codegen.c
    branches/meshdata_transfer/source/blender/gpu/intern/gpu_extensions.c
    branches/meshdata_transfer/source/blender/imbuf/intern/IMB_anim.h
    branches/meshdata_transfer/source/blender/imbuf/intern/IMB_metadata.h
    branches/meshdata_transfer/source/blender/imbuf/intern/anim_movie.c
    branches/meshdata_transfer/source/blender/imbuf/intern/bmp.c
    branches/meshdata_transfer/source/blender/imbuf/intern/cache.c
    branches/meshdata_transfer/source/blender/imbuf/intern/filetype.c
    branches/meshdata_transfer/source/blender/imbuf/intern/indexer.c
    branches/meshdata_transfer/source/blender/imbuf/intern/indexer_dv.c
    branches/meshdata_transfer/source/blender/imbuf/intern/iris.c
    branches/meshdata_transfer/source/blender/imbuf/intern/jp2.c
    branches/meshdata_transfer/source/blender/imbuf/intern/jpeg.c
    branches/meshdata_transfer/source/blender/imbuf/intern/metadata.c
    branches/meshdata_transfer/source/blender/imbuf/intern/moviecache.c
    branches/meshdata_transfer/source/blender/imbuf/intern/openexr/openexr_multi.h
    branches/meshdata_transfer/source/blender/imbuf/intern/radiance_hdr.c
    branches/meshdata_transfer/source/blender/imbuf/intern/readimage.c
    branches/meshdata_transfer/source/blender/imbuf/intern/scaling.c
    branches/meshdata_transfer/source/blender/imbuf/intern/targa.c
    branches/meshdata_transfer/source/blender/imbuf/intern/thumbs.c
    branches/meshdata_transfer/source/blender/imbuf/intern/thumbs_blend.c
    branches/meshdata_transfer/source/blender/imbuf/intern/tiff.c
    branches/meshdata_transfer/source/blender/imbuf/intern/util.c
    branches/meshdata_transfer/source/blender/makesdna/DNA_meshdata_types.h
    branches/meshdata_transfer/source/blender/makesdna/DNA_movieclip_types.h
    branches/meshdata_transfer/source/blender/makesdna/DNA_node_types.h
    branches/meshdata_transfer/source/blender/makesdna/DNA_scene_types.h
    branches/meshdata_transfer/source/blender/makesdna/DNA_texture_types.h
    branches/meshdata_transfer/source/blender/makesdna/intern/dna_genfile.c
    branches/meshdata_transfer/source/blender/makesdna/intern/makesdna.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_ID.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_access.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_animation.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_armature.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_brush.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_color.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_constraint.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_image_api.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_nodetree.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_space.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_userdef.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_build.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_mask.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_mirror.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_remesh.c
    branches/meshdata_transfer/source/blender/nodes/CMakeLists.txt
    branches/meshdata_transfer/source/blender/nodes/NOD_composite.h
    branches/meshdata_transfer/source/blender/nodes/SConscript
    branches/meshdata_transfer/source/blender/nodes/composite/node_composite_tree.c
    branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/meshdata_transfer/source/blender/nodes/shader/node_shader_tree.c
    branches/meshdata_transfer/source/blender/nodes/texture/node_texture_tree.c
    branches/meshdata_transfer/source/blender/python/intern/bpy_rna.c
    branches/meshdata_transfer/source/blender/python/intern/bpy_rna_callback.c
    branches/meshdata_transfer/source/blender/render/intern/raytrace/bvh.h
    branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject.cpp
    branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
    branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject_hint.h
    branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
    branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject_rtbuild.h
    branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
    branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    branches/meshdata_transfer/source/blender/render/intern/raytrace/reorganize.h
    branches/meshdata_transfer/source/blender/render/intern/raytrace/svbvh.h
    branches/meshdata_transfer/source/blender/render/intern/raytrace/vbvh.h
    branches/meshdata_transfer/source/blender/render/intern/source/convertblender.c
    branches/meshdata_transfer/source/blender/render/intern/source/pipeline.c
    branches/meshdata_transfer/source/blender/render/intern/source/shadeinput.c
    branches/meshdata_transfer/source/blender/render/intern/source/sss.c
    branches/meshdata_transfer/source/blender/render/intern/source/strand.c
    branches/meshdata_transfer/source/blender/render/intern/source/texture_ocean.c
    branches/meshdata_transfer/source/blender/windowmanager/intern/wm.c
    branches/meshdata_transfer/source/blender/windowmanager/intern/wm_operators.c
    branches/meshdata_transfer/source/blender/windowmanager/intern/wm_window.c
    branches/meshdata_transfer/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/meshdata_transfer/source/creator/CMakeLists.txt
    branches/meshdata_transfer/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/meshdata_transfer/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h

Added Paths:
-----------
    branches/meshdata_transfer/source/blender/compositor/
    branches/meshdata_transfer/source/blender/compositor/CMakeLists.txt
    branches/meshdata_transfer/source/blender/compositor/COM_compositor.h
    branches/meshdata_transfer/source/blender/compositor/COM_defines.h
    branches/meshdata_transfer/source/blender/compositor/SConscript
    branches/meshdata_transfer/source/blender/compositor/intern/
    branches/meshdata_transfer/source/blender/compositor/intern/COM_CPUDevice.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_CPUDevice.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ChannelInfo.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ChannelInfo.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ChunkOrder.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ChunkOrder.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ChunkOrderHotspot.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_CompositorContext.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_CompositorContext.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_Converter.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_Converter.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_Device.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_Device.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ExecutionGroup.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ExecutionSystem.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_InputSocket.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_InputSocket.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_MemoryBuffer.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_MemoryBuffer.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_MemoryManager.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_MemoryManager.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_MemoryManagerState.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_MemoryManagerState.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_MemoryProxy.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_MemoryProxy.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_Node.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_Node.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_NodeBase.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_NodeBase.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_NodeOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_NodeOperation.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_NodeProgram.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_NodeProgram.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_OpenCLDevice.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_OpenCLDevice.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_OutputSocket.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_OutputSocket.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_Socket.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_Socket.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_SocketConnection.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_SocketConnection.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_SocketReader.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_SocketReader.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_WorkPackage.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_WorkPackage.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_WorkScheduler.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_compositor.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_AlphaOverNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BilateralBlurNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BlurNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BlurNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BokehBlurNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BokehImageNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BokehImageNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BoxMaskNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BrightnessNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BrightnessNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ChannelMatteNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ChromaMatteNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorBalanceNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorCorrectionNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorCurveNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorMatteNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorRampNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorRampNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorSpillNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorSpillNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorToBWNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CombineHSVANode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CombineRGBANode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CombineYCCANode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CombineYUVANode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CompositorNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CompositorNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ConvertAlphaNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CropNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CropNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DefocusNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DefocusNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DilateErodeNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DirectionalBlurNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DisplaceNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DisplaceNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DistanceMatteNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_EllipseMaskNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_FilterNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_FilterNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_FlipNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_FlipNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_GammaNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_GammaNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_GlareNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_GlareNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_GroupNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_GroupNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_HueSaturationValueNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_IDMaskNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_IDMaskNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ImageNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ImageNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_InvertNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_InvertNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_LensDistortionNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_LuminanceMatteNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MapUVNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MapUVNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MapValueNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MapValueNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MathNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MathNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MixNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MixNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MovieClipNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MovieClipNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MovieDistortionNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MuteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MuteNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_NormalNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_NormalNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_NormalizeNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_NormalizeNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_OutputFileNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_OutputFileNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_RenderLayersNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_RotateNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_RotateNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ScaleNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ScaleNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SeparateHSVANode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SeparateRGBANode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SeparateYCCANode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SeparateYUVANode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SetAlphaNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SocketProxyNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SplitViewerNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_Stabilize2dNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SwitchNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SwitchNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TextureNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TextureNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TimeNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TimeNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TonemapNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TonemapNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TransformNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TransformNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TranslateNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TranslateNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ValueNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ValueNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_VectorBlurNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_VectorCurveNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ViewLevelsNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ViewerNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ViewerNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ZCombineNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ZCombineNode.h
    branches/meshdata_transfer/source/blender/compositor/operations/
    branches/meshdata_transfer/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_AntiAliasOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BilateralBlurOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BlurBaseOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BokehBlurOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BokehImageOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BokehImageOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BoxMaskOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BrightnessOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BrightnessOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CalculateMeanOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ChangeHSVOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ChannelMatteOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ChromaMatteOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorCurveOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorMatteOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorRampOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorRampOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorSpillOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorSpillOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CombineChannelsOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CompositorOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CompositorOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertColourToValueProg.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertValueToColourProg.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CropOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CropOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CurveBaseOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CurveBaseOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DilateErodeOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DisplaceOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DisplaceOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DistanceMatteOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DotproductOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DotproductOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_EllipseMaskOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_FlipOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_FlipOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_FogGlowImageOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_FogGlowImageOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GammaCorrectOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GammaOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GammaOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GlareBaseOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GlareSimpleStarOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GlareStreaksOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GlareStreaksOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GlareThresholdOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_IDMaskOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_IDMaskOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ImageOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ImageOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_InvertOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_InvertOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_LensGhostOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_LensGhostOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_LensGlowImageOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_LensGlowImageOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_LensGlowOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_LensGlowOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MapUVOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MapUVOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MapValueOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MapValueOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MathBaseOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MathBaseOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixAddOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixAddOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixBaseOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixBaseOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixBlendOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixBlendOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixBurnOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixBurnOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixColorOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixColorOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixDarkenOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixDifferenceOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixDivideOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixDivideOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixDodgeOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixHueOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixHueOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixLightenOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixLightenOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixLinearLightOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixMultiplyOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixOverlayOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixSaturationOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixScreenOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixScreenOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixSoftLightOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixSubtractOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixValueOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixValueOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MovieClipOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MovieClipOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MovieDistortionOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MultilayerImageOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_NormalizeOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_NormalizeOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_OpenCLKernels.cl
    branches/meshdata_transfer/source/blender/compositor/operations/COM_OpenCLKernels.cl.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_OutputFileOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_OutputFileOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_PreviewOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_PreviewOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_QualityStepHelper.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_QualityStepHelper.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ReadBufferOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersAOOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersAOOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersColorOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersColorOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersDepthProg.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersDepthProg.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersEmitOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersEmitOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersImageProg.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersMistOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersMistOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersNormalOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersNormalOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersShadowOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersShadowOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersUVOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersUVOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RotateOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RotateOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ScaleOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ScaleOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SeparateChannelOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetAlphaOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetColorOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetColorOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetSamplerOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetSamplerOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetValueOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetValueOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetVectorOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetVectorOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SocketProxyOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SplitViewerOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_TextureOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_TextureOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_TonemapOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_TonemapOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_TranslateOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_TranslateOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_VectorBlurOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_VectorCurveOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ViewerBaseOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ViewerOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ViewerOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_WriteBufferOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ZCombineOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ZCombineOperation.h
    branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
    branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
    branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_boxmask.c
    branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
    branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
    branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_switch.c
    branches/meshdata_transfer/source/blender/opencl/
    branches/meshdata_transfer/source/blender/opencl/CMakeLists.txt
    branches/meshdata_transfer/source/blender/opencl/OCL_opencl.h
    branches/meshdata_transfer/source/blender/opencl/SConscript
    branches/meshdata_transfer/source/blender/opencl/intern/
    branches/meshdata_transfer/source/blender/opencl/intern/OCL_opencl.c
    branches/meshdata_transfer/source/blender/opencl/intern/clew.c
    branches/meshdata_transfer/source/blender/opencl/intern/clew.h

Removed Paths:
-------------
    branches/meshdata_transfer/source/blender/compositor/CMakeLists.txt
    branches/meshdata_transfer/source/blender/compositor/COM_compositor.h
    branches/meshdata_transfer/source/blender/compositor/COM_defines.h
    branches/meshdata_transfer/source/blender/compositor/SConscript
    branches/meshdata_transfer/source/blender/compositor/intern/
    branches/meshdata_transfer/source/blender/compositor/intern/COM_CPUDevice.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_CPUDevice.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ChannelInfo.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ChannelInfo.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ChunkOrder.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ChunkOrder.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ChunkOrderHotspot.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_CompositorContext.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_CompositorContext.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_Converter.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_Converter.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_Device.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_Device.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ExecutionGroup.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ExecutionSystem.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_InputSocket.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_InputSocket.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_MemoryBuffer.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_MemoryBuffer.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_MemoryManager.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_MemoryManager.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_MemoryManagerState.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_MemoryManagerState.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_MemoryProxy.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_MemoryProxy.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_Node.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_Node.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_NodeBase.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_NodeBase.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_NodeOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_NodeOperation.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_NodeProgram.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_NodeProgram.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_OpenCLDevice.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_OpenCLDevice.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_OutputSocket.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_OutputSocket.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_Socket.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_Socket.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_SocketConnection.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_SocketConnection.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_SocketReader.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_SocketReader.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_WorkPackage.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_WorkPackage.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_WorkScheduler.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_compositor.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_AlphaOverNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BilateralBlurNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BlurNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BlurNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BokehBlurNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BokehImageNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BokehImageNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BoxMaskNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BrightnessNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BrightnessNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ChannelMatteNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ChromaMatteNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorBalanceNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorCorrectionNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorCurveNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorMatteNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorRampNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorRampNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorSpillNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorSpillNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorToBWNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CombineHSVANode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CombineRGBANode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CombineYCCANode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CombineYUVANode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CompositorNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CompositorNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ConvertAlphaNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CropNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CropNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DefocusNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DefocusNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DilateErodeNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DirectionalBlurNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DisplaceNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DisplaceNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DistanceMatteNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_EllipseMaskNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_FilterNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_FilterNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_FlipNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_FlipNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_GammaNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_GammaNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_GlareNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_GlareNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_GroupNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_GroupNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_HueSaturationValueNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_IDMaskNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_IDMaskNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ImageNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ImageNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_InvertNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_InvertNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_LensDistortionNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_LuminanceMatteNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MapUVNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MapUVNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MapValueNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MapValueNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MathNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MathNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MixNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MixNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MovieClipNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MovieClipNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MovieDistortionNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MuteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MuteNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_NormalNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_NormalNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_NormalizeNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_NormalizeNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_OutputFileNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_OutputFileNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_RenderLayersNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_RotateNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_RotateNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ScaleNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ScaleNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SeparateHSVANode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SeparateRGBANode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SeparateYCCANode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SeparateYUVANode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SetAlphaNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SocketProxyNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SplitViewerNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_Stabilize2dNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SwitchNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SwitchNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TextureNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TextureNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TimeNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TimeNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TonemapNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TonemapNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TransformNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TransformNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TranslateNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TranslateNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ValueNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ValueNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_VectorBlurNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_VectorCurveNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ViewLevelsNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ViewerNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ViewerNode.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ZCombineNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ZCombineNode.h
    branches/meshdata_transfer/source/blender/compositor/operations/
    branches/meshdata_transfer/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_AntiAliasOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BilateralBlurOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BlurBaseOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BokehBlurOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BokehImageOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BokehImageOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BoxMaskOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BrightnessOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_BrightnessOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CalculateMeanOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ChangeHSVOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ChannelMatteOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ChromaMatteOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorCurveOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorMatteOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorRampOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorRampOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorSpillOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorSpillOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CombineChannelsOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CompositorOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CompositorOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertColourToValueProg.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertValueToColourProg.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CropOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CropOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CurveBaseOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CurveBaseOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DilateErodeOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DisplaceOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DisplaceOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DistanceMatteOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DotproductOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DotproductOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_EllipseMaskOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_FlipOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_FlipOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_FogGlowImageOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_FogGlowImageOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GammaCorrectOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GammaOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GammaOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GlareBaseOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GlareSimpleStarOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GlareStreaksOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GlareStreaksOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_GlareThresholdOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_IDMaskOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_IDMaskOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ImageOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ImageOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_InvertOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_InvertOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_LensGhostOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_LensGhostOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_LensGlowImageOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_LensGlowImageOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_LensGlowOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_LensGlowOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MapUVOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MapUVOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MapValueOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MapValueOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MathBaseOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MathBaseOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixAddOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixAddOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixBaseOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixBaseOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixBlendOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixBlendOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixBurnOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixBurnOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixColorOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixColorOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixDarkenOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixDifferenceOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixDivideOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixDivideOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixDodgeOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixHueOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixHueOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixLightenOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixLightenOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixLinearLightOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixMultiplyOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixOverlayOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixSaturationOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixScreenOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixScreenOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixSoftLightOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixSubtractOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixValueOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MixValueOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MovieClipOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MovieClipOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MovieDistortionOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MultilayerImageOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_NormalizeOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_NormalizeOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_OpenCLKernels.cl
    branches/meshdata_transfer/source/blender/compositor/operations/COM_OpenCLKernels.cl.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_OutputFileOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_OutputFileOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_PreviewOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_PreviewOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_QualityStepHelper.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_QualityStepHelper.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ReadBufferOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersAOOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersAOOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersColorOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersColorOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersDepthProg.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersDepthProg.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersEmitOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersEmitOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersImageProg.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersMistOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersMistOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersNormalOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersNormalOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersShadowOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersShadowOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersUVOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RenderLayersUVOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RotateOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_RotateOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ScaleOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ScaleOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SeparateChannelOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetAlphaOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetColorOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetColorOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetSamplerOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetSamplerOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetValueOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetValueOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetVectorOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SetVectorOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SocketProxyOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_SplitViewerOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_TextureOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_TextureOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_TonemapOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_TonemapOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_TranslateOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_TranslateOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_VectorBlurOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_VectorCurveOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ViewerBaseOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ViewerOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ViewerOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_WriteBufferOperation.h
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ZCombineOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ZCombineOperation.h
    branches/meshdata_transfer/source/blender/opencl/CMakeLists.txt
    branches/meshdata_transfer/source/blender/opencl/OCL_opencl.h
    branches/meshdata_transfer/source/blender/opencl/SConscript
    branches/meshdata_transfer/source/blender/opencl/intern/
    branches/meshdata_transfer/source/blender/opencl/intern/OCL_opencl.c
    branches/meshdata_transfer/source/blender/opencl/intern/clew.c
    branches/meshdata_transfer/source/blender/opencl/intern/clew.h

Property Changed:
----------------
    branches/meshdata_transfer/
    branches/meshdata_transfer/intern/elbeem/intern/globals.h
    branches/meshdata_transfer/source/blender/editors/interface/interface.c
    branches/meshdata_transfer/source/blender/editors/space_outliner/
    branches/meshdata_transfer/source/tools/GL/agl.gl
    branches/meshdata_transfer/source/tools/GL/cgl.gl
    branches/meshdata_transfer/source/tools/GL/deprecated.gl
    branches/meshdata_transfer/source/tools/GL/egl.gl
    branches/meshdata_transfer/source/tools/GL/glX.gl
    branches/meshdata_transfer/source/tools/GL/wgl.gl


Property changes on: branches/meshdata_transfer
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46644
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46750

Modified: branches/meshdata_transfer/CMakeLists.txt
===================================================================
--- branches/meshdata_transfer/CMakeLists.txt	2012-05-17 23:21:11 UTC (rev 46752)
+++ branches/meshdata_transfer/CMakeLists.txt	2012-05-17 23:34:54 UTC (rev 46753)
@@ -291,8 +291,9 @@
 			message(STATUS "Setting compiler to: " ${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION})
 		endif()
 	else() # unix makefile generator does not fill XCODE_VERSION var, so we get it with a command
-		execute_process(COMMAND xcodebuild -version OUTPUT_VARIABLE XCODE_VERS_BUILDNR )
-		STRING(SUBSTRING ${XCODE_VERS_BUILDNR} 6 3 XCODE_VERSION) # truncate away build-nr
+		execute_process(COMMAND xcodebuild -version OUTPUT_VARIABLE XCODE_VERS_BUILD_NR)
+		string(SUBSTRING "${XCODE_VERS_BUILD_NR}" 6 3 XCODE_VERSION) # truncate away build-nr
+		unset(XCODE_VERS_BUILD_NR)
 	endif()
 	
 	message(STATUS "Detected Xcode-version: " ${XCODE_VERSION})
@@ -837,6 +838,17 @@
 			set(GETTEXT_LIBPATH ${GETTEXT}/lib)
 			set(GETTEXT_LIBRARIES gnu_gettext)
 		endif()
+		
+		if(WITH_MOD_CLOTH_ELTOPO)
+			set(LAPACK ${LIBDIR}/lapack)
+			# set(LAPACK_INCLUDE_DIR ${LAPACK}/include)
+			set_lib_path(LAPACK_LIBPATH ${LAPACK}/lib)	
+			set(LAPACK_LIBRARIES
+				${LIBDIR}/lapack/lib/libf2c.lib
+				${LIBDIR}/lapack/lib/clapack_nowrap.lib
+				${LIBDIR}/lapack/lib/BLAS_nowrap.lib
+			)
+		endif()
 
 		set(PNG_LIBRARIES libpng)
 		set(JPEG_LIBRARIES libjpeg)
@@ -1079,7 +1091,11 @@
 				${LIBDIR}/opencollada/include/GeneratedSaxParser/include
 			)
 			set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
-			set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml)
+			if(WITH_MINGW64)
+				set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml)
+			else()
+				set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
+			endif()
 			set(PCRE_LIBRARIES pcre)
 		endif()
 

Modified: branches/meshdata_transfer/build_files/cmake/macros.cmake
===================================================================
--- branches/meshdata_transfer/build_files/cmake/macros.cmake	2012-05-17 23:21:11 UTC (rev 46752)
+++ branches/meshdata_transfer/build_files/cmake/macros.cmake	2012-05-17 23:34:54 UTC (rev 46753)
@@ -214,7 +214,8 @@
 			${OPENGL_glu_LIBRARY}
 			${PNG_LIBRARIES}
 			${ZLIB_LIBRARIES}
-			${FREETYPE_LIBRARY})
+			${FREETYPE_LIBRARY}
+			${LAPACK_LIBRARIES})
 
 	# 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

Modified: branches/meshdata_transfer/build_files/cmake/packaging.cmake
===================================================================
--- branches/meshdata_transfer/build_files/cmake/packaging.cmake	2012-05-17 23:21:11 UTC (rev 46752)
+++ branches/meshdata_transfer/build_files/cmake/packaging.cmake	2012-05-17 23:34:54 UTC (rev 46753)
@@ -1,5 +1,5 @@
 set(PROJECT_DESCRIPTION  "Blender is a very fast and versatile 3D modeller/renderer.")
-set(PROJECT_COPYRIGHT    "Copyright (C) 2001-2011 Blender Foundation")
+set(PROJECT_COPYRIGHT    "Copyright (C) 2001-2012 Blender Foundation")
 set(PROJECT_CONTACT      "foundation at blender.org")
 set(PROJECT_VENDOR       "Blender Foundation")
 set(ORG_WEBSITE          "www.blender.org")
@@ -31,7 +31,7 @@
 
 
 # Force Package Name
-set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR})
+set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-1.r${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR})
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
 	# RPM packages

Modified: branches/meshdata_transfer/build_files/package_spec/rpm/blender.spec.in
===================================================================
--- branches/meshdata_transfer/build_files/package_spec/rpm/blender.spec.in	2012-05-17 23:21:11 UTC (rev 46752)
+++ branches/meshdata_transfer/build_files/package_spec/rpm/blender.spec.in	2012-05-17 23:34:54 UTC (rev 46753)
@@ -1,6 +1,12 @@
 # -*- rpm-spec -*-
 %global __python %{__python3}
+%global blender_api @CPACK_PACKAGE_VERSION_MAJOR at .@CPACK_PACKAGE_VERSION_MINOR@
 
+%define _rpmdir @CPACK_RPM_DIRECTORY@
+%define _rpmfilename @CPACK_RPM_FILE_NAME@
+%define _unpackaged_files_terminate_build 0
+%define _topdir @CPACK_RPM_DIRECTORY@
+
 BuildRoot:      @CPACK_RPM_DIRECTORY@/@CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH@
 Summary:        @CPACK_RPM_PACKAGE_SUMMARY@
 Name:           @CPACK_RPM_PACKAGE_NAME@
@@ -9,13 +15,18 @@
 License:        @CPACK_RPM_PACKAGE_LICENSE@
 Group:          @CPACK_RPM_PACKAGE_GROUP@
 Vendor:         @CPACK_RPM_PACKAGE_VENDOR@
-Epoch:         1
+Epoch:          1
 
-%define _rpmdir @CPACK_RPM_DIRECTORY@
-%define _rpmfilename @CPACK_RPM_FILE_NAME@
-%define _unpackaged_files_terminate_build 0
-%define _topdir @CPACK_RPM_DIRECTORY@
+Requires(post):   desktop-file-utils
+Requires(post):   shared-mime-info
+Requires(postun): desktop-file-utils
+Requires(postun): shared-mime-info
 
+Provides:         blender(ABI) = %{blender_api}
+Provides:         blender-fonts = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:        blender-fonts <= 2.49a-9
+
 %description
 Blender is an integrated 3d suite for modelling, animation, rendering,
 post-production, interactive creation and playback (games). Blender has its
@@ -40,6 +51,10 @@
 fi
 mv "@CPACK_TOPLEVEL_DIRECTORY@/tmpBBroot" ${RPM_BUILD_ROOT}
 
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/blender-thumbnailer.py
+
+%find_lang %{name}
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -57,14 +72,15 @@
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi || :
 
-%files
+%files -f blender.lang
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
-%{_datadir}/%{name}/@CPACK_PACKAGE_VERSION_MAJOR at .@CPACK_PACKAGE_VERSION_MINOR@
+%{_datadir}/%{name}/%{blender_api}/datafiles/fonts
+%{_datadir}/%{name}/%{blender_api}/scripts
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/doc/blender
-%{_mandir}/man1/blender.*
+%{_datadir}/doc/%{name}
+%{_mandir}/man1/%{name}.*
 
 %changelog
 @CPACK_RPM_SPEC_CHANGELOG@

Modified: branches/meshdata_transfer/extern/eltopo/CMakeLists.txt
===================================================================
--- branches/meshdata_transfer/extern/eltopo/CMakeLists.txt	2012-05-17 23:21:11 UTC (rev 46752)
+++ branches/meshdata_transfer/extern/eltopo/CMakeLists.txt	2012-05-17 23:34:54 UTC (rev 46753)
@@ -50,15 +50,25 @@
 	common/makelevelset3.cpp
 	common/marching_triangles.cpp
 	common/predicates.cpp
+	common/runstats.cpp
 	common/sos_ccd_wrapper.cpp
 	common/wallclocktime.cpp
 	eltopo3d/accelerationgrid.cpp
 	eltopo3d/broadphasegrid.cpp
+	eltopo3d/collisionpipeline.cpp
 	eltopo3d/dynamicsurface.cpp
+	eltopo3d/edgecollapser.cpp
+	eltopo3d/edgeflipper.cpp
+	eltopo3d/edgesplitter.cpp
 	eltopo3d/eltopo.cpp
+	eltopo3d/impactzonesolver.cpp
+	eltopo3d/meshmerger.cpp
+	eltopo3d/meshsmoother.cpp
+	eltopo3d/meshpincher.cpp
 	eltopo3d/nondestructivetrimesh.cpp
 	eltopo3d/subdivisionscheme.cpp
 	eltopo3d/surftrack.cpp
+	eltopo3d/trianglequality.cpp
 	common/newsparse/dense_matrix.cpp
 	common/newsparse/krylov_solvers.cpp
 	common/newsparse/sparse_matrix.cpp

Modified: branches/meshdata_transfer/extern/eltopo/common/ccd_defs.h
===================================================================
--- branches/meshdata_transfer/extern/eltopo/common/ccd_defs.h	2012-05-17 23:21:11 UTC (rev 46752)
+++ branches/meshdata_transfer/extern/eltopo/common/ccd_defs.h	2012-05-17 23:34:54 UTC (rev 46753)
@@ -11,7 +11,7 @@
 // Uncomment one of the following (cubic solver version has been tested hardest):
 //
 
-//#define USE_CUBIC_SOLVER_CCD
+// #define USE_CUBIC_SOLVER_CCD
 #define USE_TUNICATE_CCD
 
 #endif

Modified: branches/meshdata_transfer/extern/eltopo/eltopo3d/collisionpipeline.cpp
===================================================================
--- branches/meshdata_transfer/extern/eltopo/eltopo3d/collisionpipeline.cpp	2012-05-17 23:21:11 UTC (rev 46752)
+++ branches/meshdata_transfer/extern/eltopo/eltopo3d/collisionpipeline.cpp	2012-05-17 23:34:54 UTC (rev 46753)
@@ -126,7 +126,7 @@
     double s3 = alphas[3];
     
     double i = impulse_magnitude / (s0*s0*inv_m0 + s1*s1*inv_m1 + s2*s2*inv_m2 + s3*s3*inv_m3);
-    
+
     if ( i > 100.0 / dt )
     {
         std::cout << "big impulse: " << i << std::endl;
@@ -732,7 +732,7 @@
                 
                 g_stats.add_to_int( "CollisionPipeline::total_num_collisions", 1 );
                 
-                double relvel = collision.m_relative_displacement / dt;
+                double relvel = collision.m_relative_displacement * dt;
                 double desired_relative_velocity = 0.0;

@@ Diff output truncated at 10240 characters. @@