Cycles: svn merge -r41467:41531 ^/trunk/blender
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 4 Nov 2011 20:21:40 +0000 (20:21 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 4 Nov 2011 20:21:40 +0000 (20:21 +0000)
commit942d2fe3b7b75facbf280271b1adc31882fc5693
treed3bdbd3fd41aea01afb5ebdbb9240c8de18f1db7
parenta620ec61ec173b7d9b753c9be443fdbdb1644c71
parent7b47a4125fa4219a0f6c1a3e8c78047211caaa53
Cycles: svn merge -r41467:41531 ^/trunk/blender
CMakeLists.txt
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/nodes/shader/nodes/node_shader_geom.c
source/blenderplayer/bad_level_call_stubs/stubs.c