[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46725] trunk/blender: ____

Jeroen Bakker j.bakker at atmind.nl
Thu May 17 14:49:34 CEST 2012


Revision: 46725
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46725
Author:   jbakker
Date:     2012-05-17 12:49:33 +0000 (Thu, 17 May 2012)
Log Message:
-----------
                        ____                           
`````|````` | |        |                        ..'''' 
     |      | |        |______               .''       
     |      | |        |                  ..'          
     |      | |_______ |___________ ....''             
               merge to TRUNK!

 * The old compositor is still available (Debug Menu: 200)

This commit was brought to you by:

Developers:
 * Monique Dewanchand
 * Jeroen Bakker
 * Dalai Felinto
 * Lukas T?\195?\182nne

Review:
 * Brecht van Lommel

Testers:
 * Nate Wiebe
 * Wolfgang Faehnle
 * Carlo Andreacchio
 * Daniel Salazar
 * Artur Mag
 * Christian Krupa
 * Francesco Siddi
 * Dan McGrath
 * Bassam Kurdali

But mostly by the community:
Gold:

    Joshua Faulkner
    Michael Tiemann
    Francesco Paglia
    Blender Guru
    Blender Developers Fund

Silver:

    Pablo Vazquez
    Joel Heethaar
    Amrein Olivier
    Ilias Karasavvidis
    Thomas Kumlehn
    Sebastian Koenig
    Hannu Hoffr?\195?\169n
    Benjamin Dansie
    Fred M'ule
    Michel Vilain
    Bradley Cathey
    Gianmichele Mariani
    Gottfried Hofmann
    Bj?\195?\184rnar Fr?\195?\184yse
    Valentijn Bruning
    Paul Holmes
    Clemens Rudolph
    Juris Graphix
    David Strebel
    Ronan Zeegers
    Fran?\195?\167ois Tarlier
    Felipe Andres Esquivel Reed
    Olaf Beckman
    Jesus Alberto Olmos Linares
    Kajimba
    Maria Figueiredo
    Alexandr Galperin
    Francesco Siddi
    Julio Iglesias Lopez
    Kjartan Tysdal
    Thomas Torfs
    Film Works
    Teruyuki Nakamura
    Roger Luethi
    Benoit Bolsee
    Stefan Abrahamsen
    Andreas Mattijat
    Xavier Bouchoux
    Blender 3D Graphics and Animation
    Henk Vostermans
    Daniel Blanco Delgado
    BlenderDay/2011
    Bradley Cathey
    Matthieu Dupont de Dinechin
    Gianmichele Mariani
    J?\195?\169r?\195?\180me Scaillet

Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Roman?\195?\173 Bras?\195?\179, 
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindel?\195?\182f, Filippo Saracino, Douwe van der Veen, Olli ?\195?\132kr?\195?\164s, Bruno D'Arcangeli, 
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein, 
Wood Design Studios, Omer Khan, Jyrki Kanto, Micha?\197?\130 Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio, 
Jeremias Boos, Robert Holcomb, Gabriel Z?\195?\182ller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel, 
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, ?\208?\144?\208?\187?\208?\181?\208?\186?\209?\129?\208?\176?\208?\189?\208?\180?\209?\128 ?\208?\154?\208?\190?\209?\128?\208?\190?\209?\130?\208?\181?\208?\181?\208?\178, Brendon Harvey, 
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Mets?\195?\164l?\195?\164, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter, 
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicol?\195?\178 Zubbini, 
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch, 
Joseph Christie, Victor Hern?\195?\161ndez Garc?\195?\173a, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson, 
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song, 
Dylan Urquidi ) 

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_node.py
    trunk/blender/source/blender/CMakeLists.txt
    trunk/blender/source/blender/SConscript
    trunk/blender/source/blender/blenkernel/BKE_node.h
    trunk/blender/source/blender/blenkernel/intern/node.c
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/editors/space_image/image_ops.c
    trunk/blender/source/blender/editors/space_node/drawnode.c
    trunk/blender/source/blender/editors/space_node/node_edit.c
    trunk/blender/source/blender/makesdna/DNA_node_types.h
    trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
    trunk/blender/source/blender/makesrna/intern/rna_nodetree_types.h
    trunk/blender/source/blender/nodes/CMakeLists.txt
    trunk/blender/source/blender/nodes/NOD_composite.h
    trunk/blender/source/blender/nodes/SConscript
    trunk/blender/source/blender/nodes/composite/node_composite_tree.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_viewer.c
    trunk/blender/source/blender/render/intern/source/pipeline.c
    trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
    trunk/blender/source/creator/CMakeLists.txt

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

Modified: trunk/blender/release/scripts/startup/bl_ui/space_node.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_node.py	2012-05-17 12:36:07 UTC (rev 46724)
+++ trunk/blender/release/scripts/startup/bl_ui/space_node.py	2012-05-17 12:49:33 UTC (rev 46725)
@@ -205,5 +205,25 @@
         col.prop(snode, "backdrop_y", text="Y")
         col.operator("node.backimage_move", text="Move")
 
+class NODE_PT_quality(bpy.types.Panel):
+    bl_space_type = 'NODE_EDITOR'
+    bl_region_type = 'UI'
+    bl_label = "Quality"
+
+    @classmethod
+    def poll(cls, context):
+        snode = context.space_data
+        return snode.tree_type == 'COMPOSITING' and snode.node_tree is not None
+
+    def draw(self, context):
+        layout = self.layout
+        snode = context.space_data
+        tree = snode.node_tree
+
+        layout.prop(tree, "render_quality", text="Render")
+        layout.prop(tree, "edit_quality", text="Edit")
+        layout.prop(tree, "chunksize")
+        layout.prop(tree, "use_opencl")
+
 if __name__ == "__main__":  # only for live edit.
     bpy.utils.register_module(__name__)

Modified: trunk/blender/source/blender/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/CMakeLists.txt	2012-05-17 12:36:07 UTC (rev 46724)
+++ trunk/blender/source/blender/CMakeLists.txt	2012-05-17 12:49:33 UTC (rev 46725)
@@ -94,11 +94,13 @@
 add_subdirectory(blenlib)
 add_subdirectory(bmesh)
 add_subdirectory(render)
+add_subdirectory(compositor)
 add_subdirectory(blenfont)
 add_subdirectory(blenloader)
 add_subdirectory(blenpluginapi)
 add_subdirectory(ikplugin)
 add_subdirectory(gpu)
+add_subdirectory(opencl)
 add_subdirectory(imbuf)
 add_subdirectory(avi)
 add_subdirectory(nodes)

Modified: trunk/blender/source/blender/SConscript
===================================================================
--- trunk/blender/source/blender/SConscript	2012-05-17 12:36:07 UTC (rev 46724)
+++ trunk/blender/source/blender/SConscript	2012-05-17 12:49:33 UTC (rev 46725)
@@ -9,9 +9,11 @@
             'blenloader/SConscript',
             'blenpluginapi/SConscript',
             'gpu/SConscript',
+            'opencl/SConscript',
             'editors/SConscript',
             'imbuf/SConscript',
             'makesdna/SConscript',
+            'compositor/SConscript',
             'render/SConscript',
             'nodes/SConscript',
             'modifiers/SConscript',

Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h	2012-05-17 12:36:07 UTC (rev 46724)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h	2012-05-17 12:49:33 UTC (rev 46725)
@@ -145,9 +145,13 @@
 	void (*uifunc)(struct uiLayout *, struct bContext *C, struct PointerRNA *ptr);
 	/// Additional parameters in the side panel.
 	void (*uifuncbut)(struct uiLayout *, struct bContext *C, struct PointerRNA *ptr);
+	/// Additional drawing on backdrop.
+	void (*uibackdropfunc)(struct SpaceNode* snode, struct ImBuf* backdrop, struct bNode* node, int x, int y);
+
 	/// Draw a node socket. Default draws the input value button.
 	NodeSocketButtonFunction drawinputfunc;
 	NodeSocketButtonFunction drawoutputfunc;
+
 	/// Optional custom label function for the node header.
 	const char *(*labelfunc)(struct bNode *);
 	/// Optional custom resize handle polling.
@@ -647,6 +651,13 @@
 #define CMP_NODE_TONEMAP	302
 #define CMP_NODE_LENSDIST	303
 
+#define CMP_NODE_COLORCORRECTION 312
+#define CMP_NODE_MASK_BOX       313
+#define CMP_NODE_MASK_ELLIPSE   314
+#define CMP_NODE_BOKEHIMAGE     315
+#define CMP_NODE_BOKEHBLUR      316
+#define CMP_NODE_SWITCH         317
+
 /* channel toggles */
 #define CMP_CHAN_RGB		1
 #define CMP_CHAN_A			2
@@ -674,7 +685,7 @@
 struct CompBuf;
 struct bNodeTreeExec *ntreeCompositBeginExecTree(struct bNodeTree *ntree, int use_tree_data);
 void ntreeCompositEndExecTree(struct bNodeTreeExec *exec, int use_tree_data);
-void ntreeCompositExecTree(struct bNodeTree *ntree, struct RenderData *rd, int do_previews);
+void ntreeCompositExecTree(struct bNodeTree *ntree, struct RenderData *rd, int rendering, int do_previews);
 void ntreeCompositTagRender(struct Scene *sce);
 int ntreeCompositTagAnimated(struct bNodeTree *ntree);
 void ntreeCompositTagGenerators(struct bNodeTree *ntree);

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2012-05-17 12:36:07 UTC (rev 46724)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2012-05-17 12:49:33 UTC (rev 46725)
@@ -1930,6 +1930,13 @@
 	register_node_type_cmp_transform(ttype);
 	register_node_type_cmp_stabilize2d(ttype);
 	register_node_type_cmp_moviedistortion(ttype);
+
+	register_node_type_cmp_colorcorrection(ttype);
+	register_node_type_cmp_boxmask(ttype);
+	register_node_type_cmp_ellipsemask(ttype);
+	register_node_type_cmp_bokehimage(ttype);
+	register_node_type_cmp_bokehblur(ttype);
+	register_node_type_cmp_switch(ttype);
 }
 
 static void registerShaderNodes(bNodeTreeType *ttype) 

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2012-05-17 12:36:07 UTC (rev 46724)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-05-17 12:49:33 UTC (rev 46725)
@@ -7402,6 +7402,10 @@
 
 
 	if (main->versionfile < 263) {
+		/* Default for old files is to save particle rotations to pointcache */
+		ParticleSettings *part;
+		for (part = main->particle.first; part; part = part->id.next)
+			part->flag |= PART_ROTATIONS;
 		{
 			/* Default for old files is to save particle rotations to pointcache */
 			ParticleSettings *part;
@@ -7419,6 +7423,9 @@
 			for (ntree = main->nodetree.first; ntree; ntree=ntree->id.next)
 				do_versions_nodetree_multi_file_output_path_2_64_0(ntree);
 		}
+
+
+
 	}
 
 	if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 3)) {
@@ -7525,7 +7532,15 @@
 
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
 	/* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */
-
+	{
+		Scene *scene;
+		// composite redesign
+		for (scene=main->scene.first; scene; scene=scene->id.next)
+			if (scene->nodetree) 
+				if ( scene->nodetree->chunksize == 0) {
+					scene->nodetree->chunksize = 256;
+				}
+	}
 	/* don't forget to set version number in blender.c! */
 }
 

Added: trunk/blender/source/blender/compositor/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/compositor/CMakeLists.txt	                        (rev 0)
+++ trunk/blender/source/blender/compositor/CMakeLists.txt	2012-05-17 12:49:33 UTC (rev 46725)
@@ -0,0 +1,607 @@
+# $Id: CMakeLists.txt 14444 2008-04-16 22:40:48Z hos $
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2011, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jeroen Bakker, Monique Dewanchand, Blender Developers Fund.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+set(INC
+	.
+	../blenkernel
+	../blenlib
+	../makesdna
+	../render/extern/include
+	../render/intern/include
+	../makesrna
+	../blenloader
+	../blenlib
+	../windowmanager
+	../imbuf
+	../../../intern/guardedalloc
+	nodes
+	../nodes/
+	../nodes/composite
+	../nodes/intern
+	intern
+	operations
+	../opencl
+)
+
+set(SRC
+	COM_compositor.h
+	COM_defines.h
+
+	intern/COM_compositor.cpp
+	intern/COM_ExecutionSystem.cpp
+	intern/COM_ExecutionSystem.h
+	intern/COM_ExecutionSystemHelper.cpp
+	intern/COM_ExecutionSystemHelper.h
+	intern/COM_Converter.cpp
+	intern/COM_Converter.h
+	intern/COM_ExecutionGroup.cpp
+	intern/COM_ExecutionGroup.h
+	intern/COM_Node.cpp
+	intern/COM_Node.h
+	intern/COM_NodeBase.cpp
+	intern/COM_NodeBase.h
+	intern/COM_NodeOperation.cpp
+	intern/COM_NodeOperation.h
+	intern/COM_Socket.cpp
+	intern/COM_Socket.h
+	intern/COM_SocketReader.cpp
+	intern/COM_SocketReader.h
+	intern/COM_InputSocket.cpp
+	intern/COM_InputSocket.h
+	intern/COM_OutputSocket.cpp
+	intern/COM_OutputSocket.h
+	intern/COM_SocketConnection.cpp
+	intern/COM_SocketConnection.h
+	intern/COM_MemoryProxy.cpp
+	intern/COM_MemoryProxy.h
+	intern/COM_MemoryBuffer.cpp
+	intern/COM_MemoryBuffer.h
+	intern/COM_MemoryManager.cpp
+	intern/COM_MemoryManager.h
+	intern/COM_MemoryManagerState.cpp
+	intern/COM_MemoryManagerState.h
+	intern/COM_WorkScheduler.cpp
+	intern/COM_WorkScheduler.h
+	intern/COM_WorkPackage.cpp
+	intern/COM_WorkPackage.h
+	intern/COM_ChunkOrder.cpp
+	intern/COM_ChunkOrder.h
+	intern/COM_ChunkOrderHotspot.cpp
+	intern/COM_ChunkOrderHotspot.h
+	intern/COM_Device.cpp
+	intern/COM_Device.h
+	intern/COM_CPUDevice.cpp
+	intern/COM_CPUDevice.h
+	intern/COM_OpenCLDevice.cpp
+	intern/COM_OpenCLDevice.h
+	intern/COM_CompositorContext.cpp
+	intern/COM_CompositorContext.h
+	intern/COM_ChannelInfo.cpp
+	intern/COM_ChannelInfo.h
+	operations/COM_QualityStepHelper.h
+	operations/COM_QualityStepHelper.cpp
+
+# Internal nodes
+	nodes/COM_MuteNode.cpp
+	nodes/COM_MuteNode.h
+	nodes/COM_GroupNode.cpp
+	nodes/COM_GroupNode.h
+	nodes/COM_SocketProxyNode.cpp
+	nodes/COM_SocketProxyNode.h
+
+# input nodes
+	nodes/COM_RenderLayersNode.cpp
+	nodes/COM_RenderLayersNode.h
+	nodes/COM_ImageNode.cpp
+	nodes/COM_ImageNode.h
+	nodes/COM_TextureNode.cpp
+	nodes/COM_TextureNode.h
+	nodes/COM_BokehImageNode.cpp
+	nodes/COM_BokehImageNode.h
+	nodes/COM_ColorNode.cpp
+	nodes/COM_ColorNode.h

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list