Campbell Barton 5a803b7edf svn merge ^/trunk/blender -r48415:48469

2012-07-01 15:39:02 +00:00

..

intern

svn merge ^/trunk/blender -r48415:48469

2012-07-01 15:39:02 +00:00

nodes

svn merge ^/trunk/blender -r48305:48307

2012-06-26 10:17:11 +00:00

operations

svn merge ^/trunk/blender -r48415:48469

2012-07-01 15:39:02 +00:00

CMakeLists.txt

svn merge ^/trunk/blender -r48333:48370

2012-06-28 11:20:19 +00:00

COM_compositor.h

style cleanup: comments

2012-06-30 22:49:33 +00:00

COM_defines.h

* Enabled OpenCL for the compositor

2012-06-18 21:20:11 +00:00

SConscript

Don't link compositor with blender player.

2012-05-17 22:47:05 +00:00