Merging r40242 through r40264 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 16 Sep 2011 14:45:32 +0000 (14:45 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 16 Sep 2011 14:45:32 +0000 (14:45 +0000)
1  2 
source/blender/blenkernel/intern/node.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_view.c
source/blender/imbuf/intern/filter.c
source/blender/imbuf/intern/indexer.c
source/blender/nodes/composite/node_composite_tree.c
source/blender/render/intern/source/envmap.c

Simple merge
Simple merge