merge with gitorious
authorJeroen Bakker <jbakker@laptop-atmind.(none)>
Tue, 15 Nov 2011 20:16:04 +0000 (21:16 +0100)
committerJeroen Bakker <jbakker@laptop-atmind.(none)>
Tue, 15 Nov 2011 20:16:04 +0000 (21:16 +0100)
commit222aacf7b46753719ef0b703881809aa1f64366b
tree8aca809054086f82f11720bebc8225ab689dbbb9
parentda67805bc5d458686bb68517ef6d19c55c9b0003
parent143ab2562ec123dad6b48a9f4cf6e550d396a479
merge with gitorious
14 files changed:
source/blender/blenkernel/intern/node.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/render/render_internal.c
source/blender/editors/space_node/CMakeLists.txt
source/blender/editors/space_node/SConscript
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_intern.h
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_space.c
source/blender/nodes/composite/node_composite_tree.c
source/blender/render/extern/include/RE_shader_ext.h
source/blender/render/intern/source/rayshade.c
source/creator/CMakeLists.txt