syncing with trunk
authorJeroen Bakker <jbakker@laptop-atmind.(none)>
Tue, 15 Nov 2011 19:59:08 +0000 (20:59 +0100)
committerJeroen Bakker <jbakker@laptop-atmind.(none)>
Tue, 15 Nov 2011 19:59:08 +0000 (20:59 +0100)
commitda67805bc5d458686bb68517ef6d19c55c9b0003
treeb107aacae22eba63d3ad59cbabc209779477f986
parent25c70eac3af4a9b727076bef1d1f1f3c62fb07e2
syncing with trunk
16 files changed:
source/blender/blenkernel/intern/node.c
source/blender/compositor/COM_defines.h
source/blender/compositor/intern/COM_Converter.cpp
source/blender/compositor/intern/COM_MemoryBuffer.h
source/blender/compositor/intern/COM_Node.cpp
source/blender/compositor/intern/COM_WorkScheduler.cpp
source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp
source/blender/compositor/operations/COM_SetColorOperation.cpp
source/blender/compositor/operations/COM_SetColorOperation.h
source/blender/compositor/operations/COM_SetValueOperation.cpp
source/blender/compositor/operations/COM_WriteBufferOperation.cpp
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_nodetree_types.h
source/creator/CMakeLists.txt