Blender Git Loki

Git Commits -> Revision 5fcc889

May 12, 2014, 19:45 (GMT)
Merge branch 'blender-tiles' of gitorious.org:blender-tiles/blender-tiles into blender-tiles

Conflicts:
source/blender/blenlib/BLI_compiler_compat.h
source/blender/compositor/CMakeLists.txt
source/blender/compositor/intern/COM_ChannelInfo.h
source/blender/compositor/intern/COM_ExecutionSystem.cpp
source/blender/compositor/intern/COM_MemoryBuffer.cpp
source/blender/compositor/intern/COM_OpenCLDevice.cpp
source/blender/compositor/nodes/COM_SocketProxyNode.cpp
source/blender/compositor/operations/COM_CompositorOperation.cpp
source/blender/compositor/operations/COM_ReadBufferOperation.h
source/blender/compositor/operations/COM_RenderLayersProg.cpp

Commit Details:

Full Hash: 5fcc889baa03f5b614687f5e7a74c450b98a8f42
Parent Commits: 3b691b5, 815c999

Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021