Campbell Barton 04854d9048 svn merge ^/trunk/blender -r47272:47306

2012-06-01 05:50:17 +00:00

..

intern

svn merge ^/trunk/blender -r47272:47306

2012-06-01 05:50:17 +00:00

nodes

svn merge ^/trunk/blender -r47272:47306

2012-06-01 05:50:17 +00:00

operations

svn merge ^/trunk/blender -r47272:47306

2012-06-01 05:50:17 +00:00

CMakeLists.txt

svn merge ^/trunk/blender -r47272:47306

2012-06-01 05:50:17 +00:00

COM_compositor.h

style cleanup: compositor, pointer syntax, function brace placement, line length

2012-05-17 22:55:28 +00:00

COM_defines.h

____

2012-05-17 12:49:33 +00:00

SConscript

Don't link compositor with blender player.

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