Sergey Sharybin c9aa6cf80d Merging r47307 through r47325 from trunk into soc-2011-tomato

2012-06-01 14:08:18 +00:00

..

composite

Merging r47307 through r47325 from trunk into soc-2011-tomato

2012-06-01 14:08:18 +00:00

intern

Added NULL-pointer check to avoid crash in node editor. Fixes #31664

2012-06-01 13:42:18 +00:00

shader

Reroute nodes, by Jeroen Bakker (patch #28443).

2012-06-01 12:38:03 +00:00

texture

Reroute nodes, by Jeroen Bakker (patch #28443).

2012-06-01 12:38:03 +00:00

CMakeLists.txt

svn merge ^/trunk/blender -r47150:47184

2012-05-29 15:02:21 +00:00

NOD_composite.h

Initial commit of new keying nodes

2012-05-29 14:00:47 +00:00

NOD_shader.h

Cycles: add Object Info node, with outputs object location, object/material

2012-05-21 12:52:28 +00:00

NOD_socket.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

NOD_texture.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

SConscript

____

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