Brecht Van Lommel b5d1f7a073 Cycles: missed these files in merge commit.

2011-09-17 14:38:56 +00:00

..

composite

use replace 0 with NULL for pointers, set some functions static

2011-09-16 08:20:21 +00:00

intern

Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-17 13:28:40 +00:00

shader

Cycles: missed these files in merge commit.

2011-09-17 14:38:56 +00:00

texture

Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-17 13:28:40 +00:00

CMakeLists.txt

Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-17 13:28:40 +00:00

NOD_composite.h

SVN maintenance.

2011-09-05 22:04:30 +00:00

NOD_shader.h

Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-17 13:28:40 +00:00

NOD_socket.h

SVN maintenance.

2011-09-05 22:04:30 +00:00

NOD_texture.h

SVN maintenance.

2011-09-05 22:04:30 +00:00

SConscript

Merged the particles-2010 branch with node improvements into trunk.

2011-09-05 21:01:50 +00:00