[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46845] branches/meshdata_transfer: svn merge ^/trunk/blender -r46750:HEAD
Ove Murberg Henriksen
sorayasilvermoon at hotmail.com
Mon May 21 17:14:34 CEST 2012
Revision: 46845
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46845
Author: cyborgmuppet
Date: 2012-05-21 15:14:32 +0000 (Mon, 21 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46750:HEAD
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46750
Modified Paths:
--------------
branches/meshdata_transfer/CMakeLists.txt
branches/meshdata_transfer/intern/cycles/blender/blender_object.cpp
branches/meshdata_transfer/intern/cycles/blender/blender_session.cpp
branches/meshdata_transfer/intern/cycles/blender/blender_shader.cpp
branches/meshdata_transfer/intern/cycles/kernel/kernel_object.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_shader.h
branches/meshdata_transfer/intern/cycles/kernel/svm/svm.h
branches/meshdata_transfer/intern/cycles/kernel/svm/svm_geometry.h
branches/meshdata_transfer/intern/cycles/kernel/svm/svm_tex_coord.h
branches/meshdata_transfer/intern/cycles/kernel/svm/svm_types.h
branches/meshdata_transfer/intern/cycles/render/film.cpp
branches/meshdata_transfer/intern/cycles/render/nodes.cpp
branches/meshdata_transfer/intern/cycles/render/nodes.h
branches/meshdata_transfer/intern/cycles/render/object.cpp
branches/meshdata_transfer/intern/cycles/render/object.h
branches/meshdata_transfer/intern/cycles/util/util_hash.h
branches/meshdata_transfer/intern/elbeem/CMakeLists.txt
branches/meshdata_transfer/intern/ghost/GHOST_C-api.h
branches/meshdata_transfer/intern/ghost/GHOST_IEvent.h
branches/meshdata_transfer/intern/ghost/GHOST_IEventConsumer.h
branches/meshdata_transfer/intern/ghost/GHOST_ISystem.h
branches/meshdata_transfer/intern/ghost/GHOST_ISystemPaths.h
branches/meshdata_transfer/intern/ghost/GHOST_ITimerTask.h
branches/meshdata_transfer/intern/ghost/GHOST_IWindow.h
branches/meshdata_transfer/intern/ghost/GHOST_Path-api.h
branches/meshdata_transfer/intern/ghost/GHOST_Rect.h
branches/meshdata_transfer/intern/ghost/GHOST_Types.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_Buttons.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_Buttons.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_C-api.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_CallbackEventConsumer.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_DisplayManager.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_DisplayManagerCarbon.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_DisplayManagerNULL.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_DisplayManagerSDL.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_DisplayManagerX11.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_DropTargetWin32.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_DropTargetWin32.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_DropTargetX11.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_DropTargetX11.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_Event.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_EventButton.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_EventCursor.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_EventDragnDrop.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_EventKey.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_EventManager.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_EventManager.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_EventNDOF.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_EventPrinter.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_EventPrinter.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_EventString.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_EventTrackpad.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_EventWheel.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_ISystem.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_ISystemPaths.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_ModifierKeys.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_ModifierKeys.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_NDOFManager.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_NDOFManagerWin32.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_Path-api.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_Rect.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_System.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_System.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemCarbon.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemCocoa.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemNULL.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPaths.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPathsCarbon.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPathsCarbon.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPathsCocoa.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPathsWin32.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPathsX11.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemSDL.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemWin32.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemX11.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemX11.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_TaskbarWin32.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_TimerManager.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_TimerManager.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_TimerTask.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_Window.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_Window.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_WindowCarbon.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_WindowCocoa.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/meshdata_transfer/intern/ghost/intern/GHOST_WindowManager.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_WindowManager.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_WindowNULL.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_WindowSDL.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_WindowSDL.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_WindowWin32.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_WindowX11.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_WindowX11.h
branches/meshdata_transfer/intern/ghost/test/gears/GHOST_Test.cpp
branches/meshdata_transfer/release/scripts/startup/bl_operators/wm.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_info.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_sequencer.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_userpref.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_view3d.py
branches/meshdata_transfer/source/blender/avi/intern/avi.c
branches/meshdata_transfer/source/blender/avi/intern/avirgb.c
branches/meshdata_transfer/source/blender/blenkernel/BKE_node.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_sequencer.h
branches/meshdata_transfer/source/blender/blenkernel/CMakeLists.txt
branches/meshdata_transfer/source/blender/blenkernel/intern/CCGSubSurf.c
branches/meshdata_transfer/source/blender/blenkernel/intern/DerivedMesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/action.c
branches/meshdata_transfer/source/blender/blenkernel/intern/anim.c
branches/meshdata_transfer/source/blender/blenkernel/intern/armature.c
branches/meshdata_transfer/source/blender/blenkernel/intern/blender.c
branches/meshdata_transfer/source/blender/blenkernel/intern/cdderivedmesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/context.c
branches/meshdata_transfer/source/blender/blenkernel/intern/curve.c
branches/meshdata_transfer/source/blender/blenkernel/intern/customdata.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/fcurve.c
branches/meshdata_transfer/source/blender/blenkernel/intern/font.c
branches/meshdata_transfer/source/blender/blenkernel/intern/group.c
branches/meshdata_transfer/source/blender/blenkernel/intern/image.c
branches/meshdata_transfer/source/blender/blenkernel/intern/image_gen.c
branches/meshdata_transfer/source/blender/blenkernel/intern/key.c
branches/meshdata_transfer/source/blender/blenkernel/intern/lattice.c
branches/meshdata_transfer/source/blender/blenkernel/intern/mball.c
branches/meshdata_transfer/source/blender/blenkernel/intern/mesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/mesh_validate.c
branches/meshdata_transfer/source/blender/blenkernel/intern/modifier.c
branches/meshdata_transfer/source/blender/blenkernel/intern/movieclip.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/ocean.c
branches/meshdata_transfer/source/blender/blenkernel/intern/particle.c
branches/meshdata_transfer/source/blender/blenkernel/intern/particle_system.c
branches/meshdata_transfer/source/blender/blenkernel/intern/pointcache.c
branches/meshdata_transfer/source/blender/blenkernel/intern/screen.c
branches/meshdata_transfer/source/blender/blenkernel/intern/seqeffects.c
branches/meshdata_transfer/source/blender/blenkernel/intern/sequencer.c
branches/meshdata_transfer/source/blender/blenkernel/intern/smoke.c
branches/meshdata_transfer/source/blender/blenkernel/intern/softbody.c
branches/meshdata_transfer/source/blender/blenkernel/intern/subsurf_ccg.c
branches/meshdata_transfer/source/blender/blenkernel/intern/text.c
branches/meshdata_transfer/source/blender/blenkernel/intern/texture.c
branches/meshdata_transfer/source/blender/blenkernel/intern/writeffmpeg.c
branches/meshdata_transfer/source/blender/blenlib/intern/BLI_args.c
branches/meshdata_transfer/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/meshdata_transfer/source/blender/blenlib/intern/fnmatch.c
branches/meshdata_transfer/source/blender/blenlib/intern/math_rotation.c
branches/meshdata_transfer/source/blender/blenlib/intern/path_util.c
branches/meshdata_transfer/source/blender/blenlib/intern/pbvh.c
branches/meshdata_transfer/source/blender/blenlib/intern/string.c
branches/meshdata_transfer/source/blender/blenlib/intern/uvproject.c
branches/meshdata_transfer/source/blender/blenlib/intern/winstuff.c
branches/meshdata_transfer/source/blender/blenloader/intern/readfile.c
branches/meshdata_transfer/source/blender/blenloader/intern/versioning_250.c
branches/meshdata_transfer/source/blender/blenloader/intern/versioning_legacy.c
branches/meshdata_transfer/source/blender/blenloader/intern/writefile.c
branches/meshdata_transfer/source/blender/bmesh/bmesh.h
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_mods.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_operators.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_polygon.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_queries.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_connect.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_create.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_utils.c
branches/meshdata_transfer/source/blender/bmesh/tools/BME_bevel.c
branches/meshdata_transfer/source/blender/compositor/CMakeLists.txt
branches/meshdata_transfer/source/blender/compositor/SConscript
branches/meshdata_transfer/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/meshdata_transfer/source/blender/compositor/nodes/COM_GlareNode.cpp
branches/meshdata_transfer/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/meshdata_transfer/source/blender/compositor/nodes/COM_OutputFileNode.cpp
branches/meshdata_transfer/source/blender/compositor/nodes/COM_TimeNode.cpp
branches/meshdata_transfer/source/blender/compositor/operations/COM_BokehImageOperation.cpp
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_GlareBaseOperation.cpp
branches/meshdata_transfer/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/meshdata_transfer/source/blender/compositor/operations/COM_MapUVOperation.h
branches/meshdata_transfer/source/blender/compositor/operations/COM_MovieClipOperation.cpp
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/editors/animation/anim_channels_defines.c
branches/meshdata_transfer/source/blender/editors/animation/anim_channels_edit.c
branches/meshdata_transfer/source/blender/editors/animation/anim_draw.c
branches/meshdata_transfer/source/blender/editors/animation/drivers.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/meshlaplacian.c
branches/meshdata_transfer/source/blender/editors/armature/poseobject.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/gpencil/gpencil_paint.c
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_layout.c
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_widgets.c
branches/meshdata_transfer/source/blender/editors/interface/resources.c
branches/meshdata_transfer/source/blender/editors/interface/view2d.c
branches/meshdata_transfer/source/blender/editors/mesh/editface.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_knife.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_rip.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/object/object_add.c
branches/meshdata_transfer/source/blender/editors/object/object_bake.c
branches/meshdata_transfer/source/blender/editors/object/object_edit.c
branches/meshdata_transfer/source/blender/editors/object/object_modifier.c
branches/meshdata_transfer/source/blender/editors/object/object_ops.c
branches/meshdata_transfer/source/blender/editors/object/object_relations.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/physics/physics_fluid.c
branches/meshdata_transfer/source/blender/editors/render/render_internal.c
branches/meshdata_transfer/source/blender/editors/render/render_preview.c
branches/meshdata_transfer/source/blender/editors/render/render_shading.c
branches/meshdata_transfer/source/blender/editors/screen/area.c
branches/meshdata_transfer/source/blender/editors/screen/screen_edit.c
branches/meshdata_transfer/source/blender/editors/screen/screen_ops.c
branches/meshdata_transfer/source/blender/editors/screen/screendump.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_cursor.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_draw.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_ops.c
branches/meshdata_transfer/source/blender/editors/space_console/console_ops.c
branches/meshdata_transfer/source/blender/editors/space_file/file_ops.c
branches/meshdata_transfer/source/blender/editors/space_file/file_panels.c
branches/meshdata_transfer/source/blender/editors/space_file/filelist.c
branches/meshdata_transfer/source/blender/editors/space_file/filesel.c
branches/meshdata_transfer/source/blender/editors/space_file/fsmenu.c
branches/meshdata_transfer/source/blender/editors/space_file/fsmenu.h
branches/meshdata_transfer/source/blender/editors/space_file/space_file.c
branches/meshdata_transfer/source/blender/editors/space_graph/graph_edit.c
branches/meshdata_transfer/source/blender/editors/space_image/image_ops.c
branches/meshdata_transfer/source/blender/editors/space_logic/logic_window.c
branches/meshdata_transfer/source/blender/editors/space_nla/nla_buttons.c
branches/meshdata_transfer/source/blender/editors/space_nla/nla_draw.c
branches/meshdata_transfer/source/blender/editors/space_nla/nla_edit.c
branches/meshdata_transfer/source/blender/editors/space_node/drawnode.c
branches/meshdata_transfer/source/blender/editors/space_node/node_edit.c
branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_draw.c
branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_edit.c
branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_select.c
branches/meshdata_transfer/source/blender/editors/space_text/text_draw.c
branches/meshdata_transfer/source/blender/editors/space_text/text_ops.c
branches/meshdata_transfer/source/blender/editors/space_time/space_time.c
branches/meshdata_transfer/source/blender/editors/space_userpref/space_userpref.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawarmature.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawmesh.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/space_view3d/view3d_fly.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_select.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_toolbar.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_view.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/editors/transform/transform_generics.c
branches/meshdata_transfer/source/blender/editors/transform/transform_input.c
branches/meshdata_transfer/source/blender/editors/transform/transform_manipulator.c
branches/meshdata_transfer/source/blender/editors/transform/transform_orientations.c
branches/meshdata_transfer/source/blender/editors/transform/transform_snap.c
branches/meshdata_transfer/source/blender/editors/util/editmode_undo.c
branches/meshdata_transfer/source/blender/editors/util/undo.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_ops.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/meshdata_transfer/source/blender/gpu/intern/gpu_draw.c
branches/meshdata_transfer/source/blender/gpu/intern/gpu_material.c
branches/meshdata_transfer/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/meshdata_transfer/source/blender/gpu/shaders/gpu_shader_material.glsl.c
branches/meshdata_transfer/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/meshdata_transfer/source/blender/imbuf/intern/anim_movie.c
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/meshdata_transfer/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/meshdata_transfer/source/blender/imbuf/intern/filetype.c
branches/meshdata_transfer/source/blender/imbuf/intern/filter.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/jp2.c
branches/meshdata_transfer/source/blender/imbuf/intern/moviecache.c
branches/meshdata_transfer/source/blender/imbuf/intern/png.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/tiff.c
branches/meshdata_transfer/source/blender/imbuf/intern/util.c
branches/meshdata_transfer/source/blender/makesdna/DNA_modifier_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_node_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_object_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/makesrna.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_access.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_controller.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_main_api.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_mesh.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_modifier.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_object_api.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_rna.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_scene.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_sequencer.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_userdef.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_wm.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_collision.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_dynamicpaint.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_mask.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_remesh.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_screw.c
branches/meshdata_transfer/source/blender/nodes/CMakeLists.txt
branches/meshdata_transfer/source/blender/nodes/NOD_shader.h
branches/meshdata_transfer/source/blender/nodes/composite/node_composite_util.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_image.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/meshdata_transfer/source/blender/nodes/intern/node_common.c
branches/meshdata_transfer/source/blender/nodes/intern/node_exec.c
branches/meshdata_transfer/source/blender/nodes/intern/node_util.c
branches/meshdata_transfer/source/blender/nodes/shader/node_shader_util.c
branches/meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/meshdata_transfer/source/blender/opencl/CMakeLists.txt
branches/meshdata_transfer/source/blender/opencl/intern/clew.c
branches/meshdata_transfer/source/blender/opencl/intern/clew.h
branches/meshdata_transfer/source/blender/python/bmesh/bmesh_py_types.c
branches/meshdata_transfer/source/blender/python/generic/bpy_internal_import.c
branches/meshdata_transfer/source/blender/python/generic/idprop_py_api.c
branches/meshdata_transfer/source/blender/python/generic/py_capi_utils.c
branches/meshdata_transfer/source/blender/python/intern/bpy_driver.c
branches/meshdata_transfer/source/blender/python/intern/bpy_interface.c
branches/meshdata_transfer/source/blender/python/intern/bpy_library.c
branches/meshdata_transfer/source/blender/python/intern/bpy_operator.c
branches/meshdata_transfer/source/blender/python/intern/bpy_props.c
branches/meshdata_transfer/source/blender/python/intern/bpy_rna.c
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_Quaternion.c
branches/meshdata_transfer/source/blender/quicktime/apple/quicktime_export.c
branches/meshdata_transfer/source/blender/render/intern/source/convertblender.c
branches/meshdata_transfer/source/blender/render/intern/source/envmap.c
branches/meshdata_transfer/source/blender/render/intern/source/initrender.c
branches/meshdata_transfer/source/blender/render/intern/source/pipeline.c
branches/meshdata_transfer/source/blender/render/intern/source/pixelshading.c
branches/meshdata_transfer/source/blender/render/intern/source/rayshade.c
branches/meshdata_transfer/source/blender/render/intern/source/render_texture.c
branches/meshdata_transfer/source/blender/render/intern/source/rendercore.c
branches/meshdata_transfer/source/blender/render/intern/source/renderdatabase.c
branches/meshdata_transfer/source/blender/render/intern/source/shadeoutput.c
branches/meshdata_transfer/source/blender/render/intern/source/sss.c
branches/meshdata_transfer/source/blender/render/intern/source/zbuf.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_draw.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_event_system.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_files.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_gesture.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_jobs.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_keymap.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/creator.c
branches/meshdata_transfer/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/meshdata_transfer/source/gameengine/GameLogic/SCA_IController.h
branches/meshdata_transfer/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/meshdata_transfer/source/gameengine/GamePlayer/xembed/CMakeLists.txt
branches/meshdata_transfer/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
branches/meshdata_transfer/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/meshdata_transfer/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
branches/meshdata_transfer/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/meshdata_transfer/source/gameengine/SceneGraph/SG_Spatial.cpp
branches/meshdata_transfer/source/tools/uncrustify.cfg
Added Paths:
-----------
branches/meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_object_info.c
Property Changed:
----------------
branches/meshdata_transfer/
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/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/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/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.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/editors/interface/interface.c
branches/meshdata_transfer/source/blender/editors/space_outliner/
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/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/OCL_opencl.c
branches/meshdata_transfer/source/blender/opencl/intern/clew.c
branches/meshdata_transfer/source/blender/opencl/intern/clew.h
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-46750
+ /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-46844
Modified: branches/meshdata_transfer/CMakeLists.txt
===================================================================
--- branches/meshdata_transfer/CMakeLists.txt 2012-05-21 14:05:47 UTC (rev 46844)
+++ branches/meshdata_transfer/CMakeLists.txt 2012-05-21 15:14:32 UTC (rev 46845)
@@ -103,8 +103,8 @@
#-----------------------------------------------------------------------------
# Redirect output files
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE )
-set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE )
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE)
+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE)
#-----------------------------------------------------------------------------
# Set default config options
@@ -1187,13 +1187,13 @@
endif()
if(${XCODE_VERSION} VERSION_LESS 4.3)
- SET(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE ) # use guaranteed existing sdk
+ set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE) # use guaranteed existing sdk
else()
# note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
# absolute pathes are more foolproof here !
- SET(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
- SET(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
- SET(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
+ set(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
+ set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
+ set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
endif()
if(WITH_LIBS10.5)
@@ -1365,7 +1365,7 @@
)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
- set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa" )
+ set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa")
#pcre is bundled with openCollada
#set(PCRE ${LIBDIR}/pcre)
#set(PCRE_LIBPATH ${PCRE}/lib)
Modified: branches/meshdata_transfer/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/meshdata_transfer/intern/cycles/blender/blender_object.cpp 2012-05-21 14:05:47 UTC (rev 46844)
+++ branches/meshdata_transfer/intern/cycles/blender/blender_object.cpp 2012-05-21 15:14:32 UTC (rev 46845)
@@ -245,6 +245,7 @@
/* object sync */
if(object_updated || (object->mesh && object->mesh->need_update)) {
object->name = b_ob.name().c_str();
+ object->instance_id = b_index;
object->pass_id = b_ob.pass_index();
object->tfm = tfm;
object->motion.pre = tfm;
Modified: branches/meshdata_transfer/intern/cycles/blender/blender_session.cpp
===================================================================
--- branches/meshdata_transfer/intern/cycles/blender/blender_session.cpp 2012-05-21 14:05:47 UTC (rev 46844)
+++ branches/meshdata_transfer/intern/cycles/blender/blender_session.cpp 2012-05-21 15:14:32 UTC (rev 46845)
@@ -220,6 +220,7 @@
buffer_params.passes = passes;
scene->film->passes = passes;
scene->film->tag_update(scene);
+ scene->integrator->tag_update(scene);
/* update scene */
sync->sync_data(b_v3d, b_engine.camera_override(), b_iter->name().c_str());
Modified: branches/meshdata_transfer/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/meshdata_transfer/intern/cycles/blender/blender_shader.cpp 2012-05-21 14:05:47 UTC (rev 46844)
+++ branches/meshdata_transfer/intern/cycles/blender/blender_shader.cpp 2012-05-21 15:14:32 UTC (rev 46845)
@@ -334,6 +334,10 @@
node = new LightFalloffNode();
break;
}
+ case BL::ShaderNode::type_OBJECT_INFO: {
+ node = new ObjectInfoNode();
+ break;
+ }
case BL::ShaderNode::type_TEX_IMAGE: {
BL::ShaderNodeTexImage b_image_node(b_node);
BL::Image b_image(b_image_node.image());
Modified: branches/meshdata_transfer/intern/cycles/kernel/kernel_object.h
===================================================================
--- branches/meshdata_transfer/intern/cycles/kernel/kernel_object.h 2012-05-21 14:05:47 UTC (rev 46844)
+++ branches/meshdata_transfer/intern/cycles/kernel/kernel_object.h 2012-05-21 15:14:32 UTC (rev 46845)
@@ -117,6 +117,16 @@
#endif
}
+__device_inline float3 object_location(KernelGlobals *kg, ShaderData *sd)
+{
+#ifdef __MOTION__
+ return make_float3(sd->ob_tfm.x.w, sd->ob_tfm.y.w, sd->ob_tfm.z.w);
+#else
+ Transform tfm = object_fetch_transform(kg, sd->object, 0.0f, OBJECT_TRANSFORM);
+ return make_float3(tfm.x.w, tfm.y.w, tfm.z.w);
+#endif
+}
+
__device_inline float object_surface_area(KernelGlobals *kg, int object)
{
int offset = object*OBJECT_SIZE + OBJECT_PROPERTIES;
@@ -134,5 +144,20 @@
return f.y;
}
+__device_inline float object_random_number(KernelGlobals *kg, int object)
+{
+ if(object == ~0)
+ return 0.0f;
+
+ int offset = object*OBJECT_SIZE + OBJECT_PROPERTIES;
+ float4 f = kernel_tex_fetch(__objects, offset);
+ return f.z;
+}
+
+__device int shader_pass_id(KernelGlobals *kg, ShaderData *sd)
+{
+ return kernel_tex_fetch(__shader_flag, (sd->shader & SHADER_MASK)*2 + 1);
+}
+
CCL_NAMESPACE_END
Modified: branches/meshdata_transfer/intern/cycles/kernel/kernel_shader.h
===================================================================
--- branches/meshdata_transfer/intern/cycles/kernel/kernel_shader.h 2012-05-21 14:05:47 UTC (rev 46844)
+++ branches/meshdata_transfer/intern/cycles/kernel/kernel_shader.h 2012-05-21 15:14:32 UTC (rev 46845)
@@ -679,11 +679,6 @@
}
#endif
-__device int shader_pass_id(KernelGlobals *kg, ShaderData *sd)
-{
- return kernel_tex_fetch(__shader_flag, (sd->shader & SHADER_MASK)*2 + 1);
-}
-
/* Free ShaderData */
__device void shader_release(KernelGlobals *kg, ShaderData *sd)
Modified: branches/meshdata_transfer/intern/cycles/kernel/svm/svm.h
===================================================================
--- branches/meshdata_transfer/intern/cycles/kernel/svm/svm.h 2012-05-21 14:05:47 UTC (rev 46844)
+++ branches/meshdata_transfer/intern/cycles/kernel/svm/svm.h 2012-05-21 15:14:32 UTC (rev 46845)
@@ -266,6 +266,9 @@
case NODE_LIGHT_PATH:
svm_node_light_path(sd, stack, node.y, node.z, path_flag);
break;
+ case NODE_OBJECT_INFO:
+ svm_node_object_info(kg, sd, stack, node.y, node.z);
+ break;
#endif
case NODE_CONVERT:
svm_node_convert(sd, stack, node.y, node.z, node.w);
Modified: branches/meshdata_transfer/intern/cycles/kernel/svm/svm_geometry.h
===================================================================
--- branches/meshdata_transfer/intern/cycles/kernel/svm/svm_geometry.h 2012-05-21 14:05:47 UTC (rev 46844)
+++ branches/meshdata_transfer/intern/cycles/kernel/svm/svm_geometry.h 2012-05-21 15:14:32 UTC (rev 46845)
@@ -74,5 +74,25 @@
#endif
}
+/* Object Info */
+
+__device void svm_node_object_info(KernelGlobals *kg, ShaderData *sd, float *stack, uint type, uint out_offset)
+{
+ float data;
+
+ switch(type) {
+ case NODE_INFO_OB_LOCATION: {
+ stack_store_float3(stack, out_offset, object_location(kg, sd));
+ return;
+ }
+ case NODE_INFO_OB_INDEX: data = object_pass_id(kg, sd->object); break;
+ case NODE_INFO_MAT_INDEX: data = shader_pass_id(kg, sd); break;
+ case NODE_INFO_OB_RANDOM: data = object_random_number(kg, sd->object); break;
+ default: data = 0.0f; break;
+ }
+
+ stack_store_float(stack, out_offset, data);
+}
+
CCL_NAMESPACE_END
Modified: branches/meshdata_transfer/intern/cycles/kernel/svm/svm_tex_coord.h
===================================================================
--- branches/meshdata_transfer/intern/cycles/kernel/svm/svm_tex_coord.h 2012-05-21 14:05:47 UTC (rev 46844)
+++ branches/meshdata_transfer/intern/cycles/kernel/svm/svm_tex_coord.h 2012-05-21 15:14:32 UTC (rev 46845)
@@ -87,7 +87,7 @@
}
case NODE_TEXCO_REFLECTION: {
if(sd->object != ~0)
- data = sd->I - 2.0f*dot(sd->N, sd->I)*sd->N;
+ data = 2.0f*dot(sd->N, sd->I)*sd->N - sd->I;
else
data = sd->I;
break;
@@ -136,7 +136,7 @@
}
case NODE_TEXCO_REFLECTION: {
if(sd->object != ~0)
- data = sd->I - 2.0f*dot(sd->N, sd->I)*sd->N;
+ data = 2.0f*dot(sd->N, sd->I)*sd->N - sd->I;
else
data = sd->I;
break;
@@ -188,7 +188,7 @@
}
case NODE_TEXCO_REFLECTION: {
if(sd->object != ~0)
- data = sd->I - 2.0f*dot(sd->N, sd->I)*sd->N;
+ data = 2.0f*dot(sd->N, sd->I)*sd->N - sd->I;
else
data = sd->I;
break;
Modified: branches/meshdata_transfer/intern/cycles/kernel/svm/svm_types.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list