Campbell Barton 121ff4223d svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build

2011-11-10 04:17:43 +00:00

..

CMakeLists.txt

Texturing: texture and 3d view draw type changes, these should only have any

2011-11-08 13:07:16 +00:00

drawnode.c

Nodes: add cycles shader nodes, these will only be available to render engines

2011-11-08 11:38:16 +00:00

node_buttons.c

UI/Nodes: templates to edit nodes from the properties editor using a tree view,

2011-11-07 22:28:49 +00:00

node_draw.c

Nodes: add socket option to hide the default value in the UI, to be used for

2011-11-07 17:30:52 +00:00

node_edit.c

Texturing: texture and 3d view draw type changes, these should only have any

2011-11-08 13:07:16 +00:00

node_header.c

Fix: incorrect use of IFACE_ macro, and correct a typo.

2011-11-08 11:02:57 +00:00

node_intern.h

use (const char*) rather than (char*) where possible.

2011-11-05 11:04:28 +00:00

node_ops.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

node_select.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

node_state.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

node_templates.c

Moving i18n code to BLF_translation.h

2011-11-09 14:13:17 +00:00

SConscript

svn merge -r41650:41655 ^/trunk/blender --- cycles merge, this wont copile, still need to manually update some funcs

2011-11-10 03:05:11 +00:00

space_node.c

Nodes: add support for shader nodes on world and lamps, in addition to materials.

2011-11-02 18:55:32 +00:00